Now plays nice with m_invisible, and fix a bug which allows users who havent spoken...

[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 9626d978038b1d56a8d8922fcaea82f58afba63f..286cef59be88587e29ca52302f197546ced449d8 100644 (file)
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -6,19 +6,22 @@
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
 #include "inspircd.h"
+#include <stdarg.h>
 
 /* $ModDesc: Allows for delay-join channels (+D) where users dont appear to join until they speak */
 
 class DelayJoinMode : public ModeHandler
 {
+       CUList empty;
+       Module* Creator;
  public:
-       DelayJoinMode(InspIRCd* Instance) : ModeHandler(Instance, 'D', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       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)
        {
@@ -31,6 +34,16 @@ class DelayJoinMode : public ModeHandler
                        }
                        else
                        {
+                               if (channel->IsModeSet('D'))
+                               {
+                                       /* Make all delayed join users visible, or if an op removes +D
+                                        * while users exist that havent spoken, they remain permenantly
+                                        * invisible on this channel!
+                                        */
+                                       CUList* names = channel->GetUsers();
+                                       for (CUListIter n = names->begin(); n != names->end(); ++n)
+                                               Creator->OnText(n->first, channel, TYPE_CHANNEL, "", 0, empty);
+                               }
                                channel->SetMode('D', adding);
                                return MODEACTION_ALLOW;
                        }
@@ -51,7 +64,7 @@ class ModuleDelayJoin : public Module
        ModuleDelayJoin(InspIRCd* Me)
                : Module(Me)
        {
-               djm = new DelayJoinMode(ServerInstance);
+               djm = new DelayJoinMode(ServerInstance, this);
                if (!ServerInstance->AddMode(djm))
                        throw ModuleException("Could not add new modes!");
        }
@@ -75,8 +88,7 @@ class ModuleDelayJoin : public Module
 
        void Implements(char* List)
        {
-               List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = 
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               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)
@@ -90,20 +102,17 @@ class ModuleDelayJoin : public Module
                {
                        std::string key("delayjoin_");
                        key.append(Ptr->name);
-                       ServerInstance->Log(DEBUG,"Key: %s", key.c_str());
+
                        /* 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)
                        {
-                               ServerInstance->Log(DEBUG,"Item: %s", n->first->nick);
                                if (!n->first->GetExt(key))
-                               {
                                        nl.insert(*n);
-                                       ServerInstance->Log(DEBUG,"Spoken: %s", n->first->nick);
-                               }
                        }
-                       ServerInstance->Log(DEBUG,"Insert self");
+
+                       /* Always show self */
                        nl[user] = user->nick;
                        nameslist = &nl;
                }
@@ -170,7 +179,7 @@ class ModuleDelayJoin : public Module
                }
        }
 
-       void OnText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       void OnText(User* user, void* dest, int target_type, const std::string &text, char status, CUList &exempt_list)
        {
                if (target_type != TYPE_CHANNEL)
                        return;
@@ -181,7 +190,7 @@ class ModuleDelayJoin : public Module
                        return;
 
                /* Display the join to everyone else (the user who joined got it earlier) */
-               channel->WriteAllExcept(user, false, 0, exempt_list, "JOIN %s", channel->name);
+               this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
 
                /* Shrink off the neccessary metadata for a specific channel */
                user->Shrink(std::string("delayjoin_")+channel->name);
@@ -195,6 +204,30 @@ class ModuleDelayJoin : public Module
 
                user->Shrink("delayjoin");
        }
+
+       void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
+       {
+               va_list argsPtr;
+               char textbuffer[MAXBUF];
+               char tb[MAXBUF];
+
+               va_start(argsPtr, text);
+               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+               va_end(argsPtr);
+               snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer);
+
+               CUList *ulist = channel->GetUsers();
+
+               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+               {
+                       /* User only appears to vanish for non-opers */
+                       if (user->Visibility && !user->Visibility->VisibleTo(i->first))
+                       {
+                               i->first->Write(std::string(tb));
+                       }
+               }
+       }
+
 };
 
 MODULE_INIT(ModuleDelayJoin)