]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_kicknorejoin.cpp
Remove InspIRCd* parameters and fields
[user/henk/code/inspircd.git] / src / modules / m_kicknorejoin.cpp
index dab129cb2884d8fdc01a8f0e20abcb389d8aa9d8..33eefadb2e110a4e55824d7c05664f81842cefda 100644 (file)
@@ -1,15 +1,21 @@
-#include <time.h>
-#include <map>
-#include <vector>
-#include <sstream>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
-inline int strtoint(const std::string &str)
+static inline int strtoint(const std::string &str)
 {
        std::istringstream ss(str);
        int result;
@@ -17,167 +23,157 @@ inline int strtoint(const std::string &str)
        return result;
 }
 
-typedef std::map<userrec*, time_t> delaylist;
+typedef std::map<User*, time_t> delaylist;
 
-class ModuleKickNoRejoin : public Module
+/** Handles channel mode +J
+ */
+class KickRejoin : public ModeHandler
 {
-       Server *Srv;
-       
-public:
-       ModuleKickNoRejoin(Server* Me)
-               : Module::Module(Me)
+ public:
+       SimpleExtItem<delaylist> ext;
+       KickRejoin(Module* Creator) : ModeHandler(Creator, 'J', PARAM_SETONLY, MODETYPE_CHANNEL),
+               ext("norejoinusers", Creator) { }
+
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
-               Srv = Me;
-               
-               Srv->AddExtendedMode('J', MT_CHANNEL, false, 1, 0);
+               if (channel->IsModeSet('J'))
+                       return std::make_pair(true, channel->GetModeParameter('J'));
+               else
+                       return std::make_pair(false, parameter);
        }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               if ((modechar == 'J') && (type == MT_CHANNEL))
+               if (!adding)
+               {
+                       ext.unset(channel);
+
+                       if (!channel->IsModeSet('J'))
+                       {
+                               return MODEACTION_DENY;
+                       }
+                       else
+                       {
+                               channel->SetModeParam('J', "");
+                               return MODEACTION_ALLOW;
+                       }
+               }
+               else if (atoi(parameter.c_str()) > 0)
                {
-                       if(!mode_on)
+                       if (!channel->IsModeSet('J'))
+                       {
+                               parameter = ConvToStr(atoi(parameter.c_str()));
+                               channel->SetModeParam('J', parameter);
+                               return MODEACTION_ALLOW;
+                       }
+                       else
                        {
-                               // Taking the mode off, we need to clean up.
-                               chanrec* c = (chanrec*)target;
-                               
-                               delaylist* dl = (delaylist*)c->GetExt("norejoinusers");
-                               
-                               if(dl)
+                               std::string cur_param = channel->GetModeParameter('J');
+                               if (cur_param == parameter)
+                               {
+                                       // mode params match, don't change mode
+                                       return MODEACTION_DENY;
+                               }
+                               else
                                {
-                                       delete dl;
-                                       c->Shrink("norejoinusers");
+                                       // new mode param, replace old with new
+                                       parameter = ConvToStr(atoi(parameter.c_str()));
+                                       if (parameter != "0")
+                                       {
+                                               channel->SetModeParam('J', parameter);
+                                               return MODEACTION_ALLOW;
+                                       }
+                                       else
+                                       {
+                                               /* Fix to jamie's fix, dont allow +J 0 on the new value! */
+                                               return MODEACTION_DENY;
+                                       }
                                }
                        }
-                       return 1;
                }
-               return 0;
+               else
+               {
+                       return MODEACTION_DENY;
+               }
+       }
+};
+
+class ModuleKickNoRejoin : public Module
+{
+       KickRejoin kr;
+
+public:
+
+       ModuleKickNoRejoin()
+               : kr(this)
+       {
+               if (!ServerInstance->Modes->AddMode(&kr))
+                       throw ModuleException("Could not add new modes!");
+               Extensible::Register(&kr.ext);
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
-               if(chan)
+               if (chan)
                {
-                       delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
-                       log(DEBUG, "m_kicknorejoin.so: tried to grab delay list");
-                       
-                       if(dl)
+                       delaylist* dl = kr.ext.get(chan);
+                       if (dl)
                        {
-                               log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it");
-                               std::vector<userrec*> itemstoremove;
-                       
-                               for(delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
+                               std::vector<User*> itemstoremove;
+
+                               for (delaylist::iterator iter = dl->begin(); iter != dl->end(); iter++)
                                {
-                                       log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
-                                       if(iter->second > time(NULL))
+                                       if (iter->second > ServerInstance->Time())
                                        {
-                                               log(DEBUG, "m_kicknorejoin.so: still inside time slot");
-                                               if(iter->first == user)                                 
+                                               if (iter->first == user)
                                                {
-                                                       log(DEBUG, "m_kicknorejoin.so: and we have the right user");
-                                                       WriteServ(user->fd, "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
-                                                       return 1;
+                                                       user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)", user->nick.c_str(), chan->name.c_str(), chan->GetModeParameter('J').c_str());
+                                                       return MOD_RES_DENY;
                                                }
                                        }
                                        else
                                        {
                                                // Expired record, remove.
-                                               log(DEBUG, "m_kicknorejoin.so: record expired");
                                                itemstoremove.push_back(iter->first);
                                        }
                                }
-                               
-                               for(unsigned int i = 0; i < itemstoremove.size(); i++)
+
+                               for (unsigned int i = 0; i < itemstoremove.size(); i++)
                                        dl->erase(itemstoremove[i]);
-                                                                                                                                       
-                               if(!dl->size())
-                               {
-                                       // Now it's empty..
-                                       delete dl;
-                                       chan->Shrink("norejoinusers");
-                               }
+
+                               if (!dl->size())
+                                       kr.ext.unset(chan);
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, std::string reason)
+
+       void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
        {
-               if(chan->IsCustomModeSet('J') && (source != user))
+               if (memb->chan->IsModeSet('J') && (source != memb->user))
                {
-                       delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
-                       
-                       if(!dl)
+                       delaylist* dl = kr.ext.get(memb->chan);
+                       if (dl)
                        {
                                dl = new delaylist;
-                               chan->Extend("norejoinusers", (char*)dl);
+                               kr.ext.set(memb->chan, dl);
                        }
-                       
-                       log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
-                       (*dl)[user] = time(NULL) + strtoint(chan->GetModeParameter('J'));
-               }
-       }
-       
-       virtual void OnChannelDelete(chanrec* chan)
-       {
-               delaylist* dl = (delaylist*)chan->GetExt("norejoinusers");
-               
-               if(dl)
-               {
-                       delete dl;
-                       chan->Shrink("norejoinusers");
+                       (*dl)[memb->user] = ServerInstance->Time() + strtoint(memb->chan->GetModeParameter('J'));
                }
        }
-       
-       virtual void OnCleanup(int target_type, void* item)
-       {
-               if(target_type == TYPE_CHANNEL)
-                       OnChannelDelete((chanrec*)item);
-       }
-
-       virtual void Implements(char* List)
-       {
-               List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnExtendedMode] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
-       }
 
-       virtual void On005Numeric(std::string &output)
+       ~ModuleKickNoRejoin()
        {
-               InsertMode(output, "J", 3);
+               ServerInstance->Modes->DelMode(&kr);
        }
 
-       virtual ~ModuleKickNoRejoin()
+       Version GetVersion()
        {
+               return Version("Channel mode J, kick-no-rejoin", VF_COMMON | VF_VENDOR);
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
-       }
-};
-
-
-class ModuleKickNoRejoinFactory : public ModuleFactory
-{
- public:
-       ModuleKickNoRejoinFactory()
-       {
-       }
-       
-       ~ModuleKickNoRejoinFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleKickNoRejoin(Me);
-       }
-       
 };
 
 
-extern "C" void * init_module( void )
-{
-       return new ModuleKickNoRejoinFactory;
-}
-
+MODULE_INIT(ModuleKickNoRejoin)