Add the User::exempt flag to m_check.

[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 bd9e0ad9e23dda77748bb641d3413aa42a27c790..c4b9336fbc20e501821e110c16dc2912cb886999 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -1,11 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013, 2016-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
- *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006-2007, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -23,6 +25,12 @@
 
 #include "inspircd.h"
 
+enum
+{
+       // From RFC 2182.
+       ERR_UNAVAILRESOURCE = 437
+};
+
 // The number of seconds the channel will be closed for.
 static unsigned int duration;
 
@@ -91,6 +99,7 @@ class JoinFlood : public ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >
        JoinFlood(Module* Creator)
                : ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >(Creator, "joinflood", 'j')
        {
+               syntax = "<joins>:<seconds>";
        }
 
        ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
@@ -103,8 +112,8 @@ class JoinFlood : public ParamMode<JoinFlood, SimpleExtItem<joinfloodsettings> >
                }
 
                /* Set up the flood parameters for this channel */
-               unsigned int njoins = ConvToInt(parameter.substr(0, colon));
-               unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
+               unsigned int njoins = ConvToNum<unsigned int>(parameter.substr(0, colon));
+               unsigned int nsecs = ConvToNum<unsigned int>(parameter.substr(colon+1));
                if ((njoins<1) || (nsecs<1))
                {
                        source->WriteNumeric(Numerics::InvalidModeParameter(channel, this, parameter));
@@ -145,7 +154,7 @@ class ModuleJoinFlood : public Module
                        joinfloodsettings *f = jf.ext.get(chan);
                        if (f && f->islocked())
                        {
-                               user->WriteNumeric(609, chan->name, "This channel is temporarily unavailable (+j). Please try again later.");
+                               user->WriteNumeric(ERR_UNAVAILRESOURCE, chan->name, "This channel is temporarily unavailable (+j is set). Please try again later.");
                                return MOD_RES_DENY;
                        }
                }
@@ -175,7 +184,7 @@ class ModuleJoinFlood : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
+               return Version("Adds channel mode j (joinflood) which helps protect against spammers which mass-join channels.", VF_VENDOR);
        }
 };