m_override now has a 'requirekey' option, that requires a special key of 'override...

[user/henk/code/inspircd.git] / src / modules / m_delayjoin.cpp

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index 0bf9595e4257c1fc81c2b0a90b4405d9855a76b7..bb96b461745f32e37368caba054096802cdd7523 100644 (file)
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -29,7 +29,7 @@ class DelayJoinMode : public ModeHandler
                {
                        if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP))
                        {
-                               source->WriteServ("482 %s %s :Only channel operators may %sset channel mode +D", source->nick, channel->name, adding ? "" : "un");
+                               source->WriteNumeric(482, "%s %s :Only channel operators may %sset channel mode +D", source->nick, channel->name, adding ? "" : "un");
                                return MODEACTION_DENY;
                        }
                        else
@@ -67,7 +67,7 @@ class ModuleDelayJoin : public Module
                djm = new DelayJoinMode(ServerInstance, this);
                if (!ServerInstance->Modes->AddMode(djm))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnUserList, I_OnText };
+               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnText };
                ServerInstance->Modules->Attach(eventlist, this, 6);
        }
        
@@ -77,45 +77,25 @@ class ModuleDelayJoin : public Module
                delete djm;
        }
 
-       void Prioritize()
-       {
-               /* To ensure that we get priority over namesx for names list generation */
-               Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
-       }
-
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
-
-       virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
+       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
        {
-               CUList* newlist = nameslist ? nameslist : Ptr->GetUsers();
-
-               nl.clear();
+               if (!channel->IsModeSet('D'))
+                       return;
 
-               /* For +D channels ... */
-               if (Ptr->IsModeSet('D'))
-               {
-                       std::string key("delayjoin_");
-                       key.append(Ptr->name);
+               if (nick.empty())
+                       return;
 
-                       /* Modify the names list, erasing users with the delay join metadata
-                        * for this channel (havent spoken yet)
-                        */
-                       for (CUListIter n = newlist->begin(); n != newlist->end(); ++n)
-                       {
-                               if (!n->first->GetExt(key))
-                                       nl.insert(*n);
-                       }
+               /* If the user is hidden by delayed join, hide them from the NAMES list */
+               std::string key("delayjoin_");
+               key.append(channel->name);
 
-                       /* Always show self */
-                       nl[user] = user->nick;
-                       nameslist = &nl;
-               }
-               return 0;
+               if (user->GetExt(key))
+                       nick.clear();
        }
 
        virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
@@ -180,6 +160,10 @@ class ModuleDelayJoin : public Module
 
        void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list)
        {
+               /* Server origin */
+               if (!user)
+                       return;
+
                if (target_type != TYPE_CHANNEL)
                        return;
 
@@ -208,7 +192,7 @@ class ModuleDelayJoin : public Module
                user->Shrink("delayjoin");
        }
 
-       void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
+       void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5)
        {
                va_list argsPtr;
                char textbuffer[MAXBUF];