Add the override keyword in places that it is missing.

[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 39ba3f9a00d580d398ec5222cdb4c79a113aeea3..b4a8f6181aa03540c9f4dd343dfe273906cc61a6 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -23,6 +23,9 @@
 
 #include "inspircd.h"
 
+// The number of seconds the channel will be closed for.
+static unsigned int duration;
+
 /** Holds settings and state associated with channel mode +j
  */
 class joinfloodsettings
@@ -71,7 +74,7 @@ class joinfloodsettings
 
        void lock()
        {
-               unlocktime = ServerInstance->Time() + 60;
+               unlocktime = ServerInstance->Time() + duration;
        }
 
        bool operator==(const joinfloodsettings& other) const
@@ -82,56 +85,40 @@ class joinfloodsettings
 
 /** Handles channel mode +j
  */
-class JoinFlood : public ModeHandler
+class JoinFlood : public ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >
 {
  public:
-       SimpleExtItem<joinfloodsettings> ext;
-       JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
-               ext("joinflood", Creator) { }
+       JoinFlood(Module* Creator)
+               : ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >(Creator, "joinflood", 'j')
+       {
+       }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
        {
-               if (adding)
+               std::string::size_type colon = parameter.find(':');
+               if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
                {
-                       std::string::size_type colon = parameter.find(':');
-                       if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
-                       {
-                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
-                               return MODEACTION_DENY;
-                       }
-
-                       /* Set up the flood parameters for this channel */
-                       unsigned int njoins = ConvToInt(parameter.substr(0, colon));
-                       unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
-                       if ((njoins<1) || (nsecs<1))
-                       {
-                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
-                               return MODEACTION_DENY;
-                       }
-
-                       joinfloodsettings jfs(nsecs, njoins);
-                       joinfloodsettings* f = ext.get(channel);
-                       if ((f) && (*f == jfs))
-                               // mode params match
-                               return MODEACTION_DENY;
-
-                       ext.set(channel, jfs);
-                       parameter = ConvToStr(njoins) + ":" + ConvToStr(nsecs);
-                       return MODEACTION_ALLOW;
+                       source->WriteNumeric(608, channel->name, "Invalid flood parameter");
+                       return MODEACTION_DENY;
                }
-               else
-               {
-                       if (!channel->IsModeSet(this))
-                               return MODEACTION_DENY;
 
-                       joinfloodsettings* f = ext.get(channel);
-                       if (f)
-                       {
-                               ext.unset(channel);
-                               return MODEACTION_ALLOW;
-                       }
+               /* Set up the flood parameters for this channel */
+               unsigned int njoins = ConvToInt(parameter.substr(0, colon));
+               unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
+               if ((njoins<1) || (nsecs<1))
+               {
+                       source->WriteNumeric(608, channel->name, "Invalid flood parameter");
+                       return MODEACTION_DENY;
                }
-               return MODEACTION_DENY;
+
+               ext.set(channel, new joinfloodsettings(nsecs, njoins));
+               return MODEACTION_ALLOW;
+       }
+
+       void SerializeParam(Channel* chan, const joinfloodsettings* jfs, std::string& out)
+       {
+               out.append(ConvToStr(jfs->joins)).push_back(':');
+               out.append(ConvToStr(jfs->secs));
        }
 };
 
@@ -145,12 +132,10 @@ class ModuleJoinFlood : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus&) CXX11_OVERRIDE
        {
-               ServerInstance->Modules->AddService(jf);
-               ServerInstance->Modules->AddService(jf.ext);
-               Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+               ConfigTag* tag = ServerInstance->Config->ConfValue("joinflood");
+               duration = tag->getDuration("duration", 60, 10, 600);
        }
 
        ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
@@ -160,7 +145,7 @@ class ModuleJoinFlood : public Module
                        joinfloodsettings *f = jf.ext.get(chan);
                        if (f && f->islocked())
                        {
-                               user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
+                               user->WriteNumeric(609, chan->name, "This channel is temporarily unavailable (+j). Please try again later.");
                                return MOD_RES_DENY;
                        }
                }
@@ -176,14 +161,14 @@ class ModuleJoinFlood : public Module
                joinfloodsettings *f = jf.ext.get(memb->chan);
 
                /* But all others are OK */
-               if (f)
+               if ((f) && (!f->islocked()))
                {
                        f->addjoin();
                        if (f->shouldlock())
                        {
                                f->clear();
                                f->lock();
-                               memb->chan->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.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.", memb->chan->name.c_str(), f->joins, f->secs);
+                               memb->chan->WriteNotice(InspIRCd::Format("This channel has been closed to new users for %u seconds because there have been more than %d joins in %d seconds.", duration, f->joins, f->secs));
                        }
                }
        }