WHEEEEE!!!!!

[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 6cc54db685fa90a79409a5821bf865bfeb6a4a9a..e739e3d92f276c6da7c8dda64bc941bd2f83da8f 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -25,7 +25,7 @@ using namespace std;
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
-class joinfloodsettings
+class joinfloodsettings : public classbase
 {
  public:
 
@@ -99,8 +99,25 @@ class JoinFlood : public ModeHandler
  public:
        JoinFlood() : ModeHandler('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)
                {
                        char ndata[MAXBUF];
@@ -126,33 +143,38 @@ 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;
                                        }
                                }
                        }
                        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);
                                return MODEACTION_ALLOW;
                        }
                }
@@ -179,12 +201,12 @@ class ModuleJoinFlood : public Module
        {
                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;
                                }
                        }
@@ -194,24 +216,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*)Srv->GetServerName().c_str(), "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");
                }