Add more features to modestacker so that we can stack +, -, and parameterless modes

[user/henk/code/inspircd.git] / include / u_listmode.h

diff --git a/include/u_listmode.h b/include/u_listmode.h
index b3c62355229bd07a441615ad667e804f6b645a37..8315dbcd1e7e795bc38b5ade6544edc916aeca50 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -8,7 +8,7 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "wildcard.h"
 #include "inspircd.h"
 
@@ -65,22 +65,22 @@ class ListModeBase : public ModeHandler
                infokey = "exceptionbase_mode_" + std::string(1, mode) + "_list";
        }
 
-        std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
+       std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       {
                modelist* el;
                channel->GetExt(infokey, el);
                if (el)
                {
-                       for (modelist::iterator it = el->begin(); it != el->end(); it++)
-                       {
-                               if(parameter == it->mask)
-                               {
+                       for (modelist::iterator it = el->begin(); it != el->end(); it++)
+                       {
+                               if(parameter == it->mask)
+                               {
                                        return std::make_pair(true, parameter);
                                }
-                       }
+                       }
                }
                return std::make_pair(false, parameter);
-        }
+       }
 
        virtual void DisplayList(userrec* user, chanrec* channel)
        {
@@ -90,10 +90,43 @@ class ListModeBase : public ModeHandler
                {
                        for(modelist::iterator it = el->begin(); it != el->end(); it++)
                        {
-                               user->WriteServ( "%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
+                               user->WriteServ("%s %s %s %s %s %s", listnumeric.c_str(), user->nick, channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
+                       }
+               }
+               user->WriteServ("%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
+       }
+
+       virtual void RemoveMode(chanrec* channel)
+       {
+               ServerInstance->Log(DEBUG,"Removing listmode base from %s %s",channel->name,infokey.c_str());
+               modelist* el;
+               channel->GetExt(infokey, el);
+               if (el)
+               {
+                       ServerInstance->Log(DEBUG,"Channel is extended with a list");
+                       char moderemove[MAXBUF];
+                       userrec* n = new userrec(ServerInstance);
+                       n->SetFd(FD_MAGIC_NUMBER);
+                       modelist copy;
+                       /* Make a copy of it, because we cant change the list whilst iterating over it */
+                       for(modelist::iterator it = el->begin(); it != el->end(); it++)
+                       {
+                               copy.push_back(*it);
+                       }
+                       for(modelist::iterator it = copy.begin(); it != copy.end(); it++)
+                       {
+                               ServerInstance->Log(DEBUG,"Remove item %s",it->mask.c_str());
+                               sprintf(moderemove,"-%c",this->GetModeChar());
+                               const char* parameters[] = { channel->name, moderemove, it->mask.c_str() };
+                               ServerInstance->SendMode(parameters, 3, n);
                        }
+                       delete n;
                }
-               user->WriteServ( "%s %s %s %s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
+       }
+
+       virtual void RemoveMode(userrec* user)
+       {
+               /* Listmodes dont get set on users */
        }
 
        virtual void DoRehash()
@@ -225,18 +258,16 @@ class ListModeBase : public ModeHandler
                                                }
                                                return MODEACTION_ALLOW;
                                        }
-                                       else
-                                       {
-                                               /* Tried to remove something that wasn't set */
-                                               TellNotSet(source, channel, parameter);
-                                       }
                                }
+                               /* Tried to remove something that wasn't set */
+                               TellNotSet(source, channel, parameter);
                                parameter = "";
                                return MODEACTION_DENY;
                        }
                        else
                        {
-                               // Hmm, taking an exception off a non-existant list, DIE
+                               /* Hmm, taking an exception off a non-existant list, DIE */
+                               TellNotSet(source, channel, parameter);
                                parameter = "";
                                return MODEACTION_DENY;
                        }
@@ -276,19 +307,6 @@ class ListModeBase : public ModeHandler
 
        virtual void DoCleanup(int target_type, void* item)
        {
-               if (target_type == TYPE_CHANNEL)
-               {
-                       chanrec* chan = (chanrec*)item;
-
-                       modelist* list;
-                       chan->GetExt(infokey, list);
-
-                       if (list)
-                       {
-                               chan->Shrink(infokey);
-                               delete list;
-                       }
-               }
        }
        
        virtual bool ValidateParam(userrec* source, chanrec* channel, std::string &parameter)