Because these modes take no parameter when being removed, they need no special code...

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index cd233a01cec7480bc86c3f2c458fd100a884d42b..c7b5700d235c14e5679ca016f3b5de29e33b7e7f 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -21,11 +21,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "configreader.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
-class joinfloodsettings
+
+
+class joinfloodsettings : public classbase
 {
  public:
 
@@ -42,16 +45,13 @@ class joinfloodsettings
                reset = time(NULL) + secs;
                counter = 0;
                locked = false;
-               log(DEBUG,"Create new joinfloodsettings: %lu %lu",time(NULL),reset);
        };
 
        void addjoin()
        {
                counter++;
-               log(DEBUG,"joinflood counter is %d",counter);
                if (time(NULL) > reset)
                {
-                       log(DEBUG,"joinflood counter reset");
                        counter = 0;
                        reset = time(NULL) + secs;
                }
@@ -64,7 +64,6 @@ class joinfloodsettings
 
        void clear()
        {
-               log(DEBUG,"joinflood counter clear");
                counter = 0;
        }
 
@@ -87,7 +86,6 @@ class joinfloodsettings
 
        void lock()
        {
-               log(DEBUG,"joinflood lock");
                locked = true;
                unlocktime = time(NULL) + 60;
        }
@@ -97,12 +95,30 @@ class joinfloodsettings
 class JoinFlood : public ModeHandler
 {
  public:
-       JoinFlood() : ModeHandler('j', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
+
+        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+        {
+                joinfloodsettings* x;
+                if (channel->GetExt("joinflood",x))
+                        return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
+                else
+                        return std::make_pair(false, parameter);
+        } 
+
+        bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       {
+               /* When TS is equal, the alphabetically later one wins */
+               return (their_param < our_param);
+       }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
+               joinfloodsettings* dummy;
+
                if (adding)
                {
+                       ServerInstance->Log(DEBUG,"Got parameter: '%s'",parameter.c_str());
                        char ndata[MAXBUF];
                        char* data = ndata;
                        strlcpy(ndata,parameter.c_str(),MAXBUF);
@@ -126,17 +142,17 @@ class JoinFlood : public ModeHandler
                                int nsecs = atoi(secs);
                                if ((njoins<1) || (nsecs<1))
                                {
-                                       WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                                       source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
                                        parameter = "";
                                        return MODEACTION_DENY;
                                }
                                else
                                {
-                                       if (!channel->GetExt("joinflood"))
+                                       if (!channel->GetExt("joinflood", dummy))
                                        {
                                                parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
                                                joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
-                                               channel->Extend("joinflood",(char*)f);
+                                               channel->Extend("joinflood", f);
                                                channel->SetMode('j', true);
                                                channel->SetModeParam('j', parameter.c_str(), true);
                                                return MODEACTION_ALLOW;
@@ -145,15 +161,16 @@ class JoinFlood : public ModeHandler
                        }
                        else
                        {
-                               WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                               source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
                                return MODEACTION_DENY;
                        }
                }
                else
                {
-                       if (channel->GetExt("joinflood"))
+                       if (channel->GetExt("joinflood", dummy))
                        {
-                               joinfloodsettings *f = (joinfloodsettings*)channel->GetExt("joinflood");
+                               joinfloodsettings *f;
+                               channel->GetExt("joinflood", f);
                                DELETE(f);
                                channel->Shrink("joinflood");
                                channel->SetMode('j', false);
@@ -166,29 +183,29 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-       Server *Srv;
+       
        JoinFlood* jf;
        
  public:
  
-       ModuleJoinFlood(Server* Me)
+       ModuleJoinFlood(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               jf = new JoinFlood();
-               Srv->AddMode(jf, 'j');
+               
+               jf = new JoinFlood(ServerInstance);
+               ServerInstance->AddMode(jf, 'j');
        }
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
                if (chan)
                {
-                       joinfloodsettings *f = (joinfloodsettings*)chan->GetExt("joinflood");
-                       if (f)
+                       joinfloodsettings *f;
+                       if (chan->GetExt("joinflood", f))
                        {
                                if (f->islocked())
                                {
-                                       WriteServ(user->fd,"609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
+                                       user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
                                        return 1;
                                }
                        }
@@ -198,24 +215,24 @@ class ModuleJoinFlood : public Module
 
        virtual void OnUserJoin(userrec* user, chanrec* channel)
        {
-               joinfloodsettings *f = (joinfloodsettings*)channel->GetExt("joinflood");
-               if (f)
+               joinfloodsettings *f;
+               if (channel->GetExt("joinflood",f))
                {
                        f->addjoin();
                        if (f->shouldlock())
                        {
                                f->clear();
                                f->lock();
-                               WriteChannelWithServ((char*)Srv->GetServerName().c_str(), channel, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.",channel->name,f->joins,f->secs);
+                               channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs);
                        }
                }
        }
 
        void OnChannelDelete(chanrec* chan)
        {
-               if (chan->GetExt("joinflood"))
+               joinfloodsettings *f;
+               if (chan->GetExt("joinflood",f))
                {
-                       joinfloodsettings *f = (joinfloodsettings*)chan->GetExt("joinflood");
                        DELETE(f);
                        chan->Shrink("joinflood");
                }
@@ -223,22 +240,18 @@ class ModuleJoinFlood : public Module
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "j", 3);
+               List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
        }
 
        virtual ~ModuleJoinFlood()
        {
+               ServerInstance->Modes->DelMode(jf);
                DELETE(jf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
        }
 };
 
@@ -254,7 +267,7 @@ class ModuleJoinFloodFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleJoinFlood(Me);
        }