Add safety check for nonexistent server in receiving server origin privmsg (shouldnt...

[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 d978921a14335c7bce35e92bc481ae3132905310..bb96b461745f32e37368caba054096802cdd7523 100644 (file)
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,13 +23,13 @@ class DelayJoinMode : public ModeHandler
  public:
        DelayJoinMode(InspIRCd* Instance, Module* Parent) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false), Creator(Parent) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (channel->IsModeSet('D') != adding)
                {
                        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
@@ -65,62 +65,40 @@ class ModuleDelayJoin : public Module
                : Module(Me)
        {
                djm = new DelayJoinMode(ServerInstance, this);
-               if (!ServerInstance->AddMode(djm))
+               if (!ServerInstance->Modes->AddMode(djm))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnText };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
        }
        
        virtual ~ModuleDelayJoin()
        {
                ServerInstance->Modes->DelMode(djm);
-               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);
+               delete djm;
        }
 
        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);
        }
 
-       void Implements(char* List)
+       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
        {
-               List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnText] = 1;
-       }
-
-       virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
-       {
-               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 &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
        {
                if (channel->IsModeSet('D'))
                {
@@ -182,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;
 
@@ -193,6 +175,10 @@ class ModuleDelayJoin : public Module
                /* Display the join to everyone else (the user who joined got it earlier) */
                this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
 
+               std::string n = this->ServerInstance->Modes->ModeString(user, channel);
+               if (n.length() > 0)
+                       this->WriteCommonFrom(user, channel, "MODE %s +%s", channel->name, n.c_str());
+
                /* Shrink off the neccessary metadata for a specific channel */
                user->Shrink(std::string("delayjoin_")+channel->name);
 
@@ -206,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];