Untested! New m_watch that should be hundreds of times faster (im not joking either)

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

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index a9dc54a3ec8c70cdb6985bfba65fb7a246b022d0..2c485fe34bc37ab4276893e60990b7034615ff93 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -5,12 +5,11 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
 
-extern InspIRCd* ServerInstance;
+
 
 inline int strtoint(const std::string &str)
 {
@@ -22,6 +21,8 @@ inline int strtoint(const std::string &str)
 
 typedef std::map<userrec*, time_t> delaylist;
 
+/** Handles channel mode +J
+ */
 class KickRejoin : public ModeHandler
 {
  public:
@@ -56,10 +57,47 @@ class KickRejoin : public ModeHandler
                }
                if ((!adding) || (atoi(parameter.c_str()) > 0))
                {
-                       parameter = ConvToStr(atoi(parameter.c_str()));
-                       channel->SetModeParam('J', parameter.c_str(), adding);
-                       channel->SetMode('J', adding);
-                       return MODEACTION_ALLOW;
+                       ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
+
+                       if (!channel->IsModeSet('J'))
+                       {
+                               parameter = ConvToStr(atoi(parameter.c_str()));
+                               channel->SetModeParam('J', parameter.c_str(), adding);
+                               channel->SetMode('J', adding);
+                               return MODEACTION_ALLOW;
+                       }
+                       else
+                       {
+                               if (!adding)
+                               {
+                                       channel->SetModeParam('J', parameter.c_str(), adding);
+                                       return MODEACTION_ALLOW;
+                               }
+
+                               std::string cur_param = channel->GetModeParameter('J');
+                               if (cur_param == parameter)
+                               {
+                                       // mode params match, don't change mode
+                                       return MODEACTION_DENY;
+                               }
+                               else
+                               {
+                                       // new mode param, replace old with new
+                                       parameter = ConvToStr(atoi(parameter.c_str()));
+                                       cur_param = ConvToStr(atoi(cur_param.c_str()));
+                                       if (parameter != "0")
+                                       {
+                                               channel->SetModeParam('J', cur_param.c_str(), false);
+                                               channel->SetModeParam('J', parameter.c_str(), adding);
+                                               return MODEACTION_ALLOW;
+                                       }
+                                       else
+                                       {
+                                               /* Fix to jamie's fix, dont allow +J 0 on the new value! */
+                                               return MODEACTION_DENY;
+                                       }
+                               }
+                       }
                }
                else
                {
@@ -70,7 +108,7 @@ class KickRejoin : public ModeHandler
 
 class ModuleKickNoRejoin : public Module
 {
-       Server *Srv;
+       
        KickRejoin* kr;
        
 public:
@@ -80,28 +118,28 @@ public:
        {
                
                kr = new KickRejoin(ServerInstance);
-               Srv->AddMode(kr, 'J');
+               ServerInstance->AddMode(kr, 'J');
        }
 
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
        {
                if (chan)
                {
                        delaylist* dl;
                        if (chan->GetExt("norejoinusers", dl))
                        {
-                               log(DEBUG, "m_kicknorejoin.so: got delay list, iterating over it");
+                               ServerInstance->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++)
                                {
-                                       log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
+                                       ServerInstance->Log(DEBUG, "m_kicknorejoin.so:\t[%s] => %d", iter->first->nick, iter->second);
                                        if (iter->second > time(NULL))
                                        {
-                                               log(DEBUG, "m_kicknorejoin.so: still inside time slot");
+                                               ServerInstance->Log(DEBUG, "m_kicknorejoin.so: still inside time slot");
                                                if (iter->first == user)                                        
                                                {
-                                                       log(DEBUG, "m_kicknorejoin.so: and we have the right user");
+                                                       ServerInstance->Log(DEBUG, "m_kicknorejoin.so: and we have the right user");
                                                        user->WriteServ( "495 %s %s :You cannot rejoin this channel yet after being kicked (+J)", user->nick, chan->name);
                                                        return 1;
                                                }
@@ -109,7 +147,7 @@ public:
                                        else
                                        {
                                                // Expired record, remove.
-                                               log(DEBUG, "m_kicknorejoin.so: record expired");
+                                               ServerInstance->Log(DEBUG, "m_kicknorejoin.so: record expired");
                                                itemstoremove.push_back(iter->first);
                                        }
                                }
@@ -120,8 +158,8 @@ public:
                                if (!dl->size())
                                {
                                        // Now it's empty..
-                                               DELETE(dl);
-                                               chan->Shrink("norejoinusers");
+                                       DELETE(dl);
+                                       chan->Shrink("norejoinusers");
                                }
                        }
                }
@@ -139,7 +177,7 @@ public:
                                chan->Extend("norejoinusers", dl);
                        }
                        
-                       log(DEBUG, "m_kicknorejoin.so: setting record for %s, %d second delay", user->nick, strtoint(chan->GetModeParameter('J')));
+                       ServerInstance->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'));
                }
        }
@@ -163,22 +201,18 @@ public:
 
        virtual void Implements(char* List)
        {
-               List[I_OnCleanup] = List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output, "J", 3);
+               List[I_OnCleanup] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserKick] = 1;
        }
 
        virtual ~ModuleKickNoRejoin()
        {
+               ServerInstance->Modes->DelMode(kr);
                DELETE(kr);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_STATIC | VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };