m_cap Convert capability names in CAP REQ to lowercase before processing them

[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 6d2d10c84c43989803ccfca34db192c0420d1d6b..ce95085d85c234a55b19e2ed5750b4a047f16ef4 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -25,33 +25,44 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel mode +J (delay rejoin after kick) */
-
-typedef std::map<User*, time_t> delaylist;
+typedef std::map<std::string, time_t> delaylist;
 
 /** Handles channel mode +J
  */
-class KickRejoin : public ParamChannelModeHandler
+class KickRejoin : public ModeHandler
 {
+       static const unsigned int max = 60;
  public:
        SimpleExtItem<delaylist> ext;
-       KickRejoin(Module* Creator) : ParamChannelModeHandler(Creator, "kicknorejoin", 'J'), ext("norejoinusers", Creator) { }
-
-       bool ParamValidate(std::string& parameter)
+       KickRejoin(Module* Creator)
+               : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL)
+               , ext("norejoinusers", Creator)
        {
-               int v = atoi(parameter.c_str());
-               if (v <= 0)
-                       return false;
-               parameter = ConvToStr(v);
-               return true;
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
        {
-               ModeAction rv = ParamChannelModeHandler::OnModeChange(source, dest, channel, parameter, adding);
-               if (rv == MODEACTION_ALLOW && !adding)
+               if (adding)
+               {
+                       int v = ConvToInt(parameter);
+                       if (v <= 0)
+                               return MODEACTION_DENY;
+                       if (parameter == channel->GetModeParameter(this))
+                               return MODEACTION_DENY;
+
+                       if ((IS_LOCAL(source) && ((unsigned int)v > max)))
+                               v = max;
+
+                       parameter = ConvToStr(v);
+               }
+               else
+               {
+                       if (!channel->IsModeSet(this))
+                               return MODEACTION_DENY;
+
                        ext.unset(channel);
-               return rv;
+               }
+               return MODEACTION_ALLOW;
        }
 };
 
@@ -60,21 +71,12 @@ class ModuleKickNoRejoin : public Module
        KickRejoin kr;
 
 public:
-
        ModuleKickNoRejoin()
                : kr(this)
        {
        }
 
-       void init()
-       {
-               ServerInstance->Modules->AddService(kr);
-               ServerInstance->Modules->AddService(kr.ext);
-               Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
-       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
                if (chan)
                {
@@ -85,11 +87,11 @@ public:
                                {
                                        if (iter->second > ServerInstance->Time())
                                        {
-                                               if (iter->first == user)
+                                               if (iter->first == user->uuid)
                                                {
                                                        std::string modeparam = chan->GetModeParameter(&kr);
-                                                       user->WriteNumeric(ERR_DELAYREJOIN, "%s %s :You must wait %s seconds after being kicked to rejoin (+J)",
-                                                               user->nick.c_str(), chan->name.c_str(), modeparam.c_str());
+                                                       user->WriteNumeric(ERR_DELAYREJOIN, "%s :You must wait %s seconds after being kicked to rejoin (+J)",
+                                                               chan->name.c_str(), modeparam.c_str());
                                                        return MOD_RES_DENY;
                                                }
                                                ++iter;
@@ -101,14 +103,14 @@ public:
                                        }
                                }
 
-                               if (!dl->size())
+                               if (dl->empty())
                                        kr.ext.unset(chan);
                        }
                }
                return MOD_RES_PASSTHRU;
        }
 
-       void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
+       void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE
        {
                if (memb->chan->IsModeSet(&kr) && (IS_LOCAL(memb->user)) && (source != memb->user))
                {
@@ -118,19 +120,14 @@ public:
                                dl = new delaylist;
                                kr.ext.set(memb->chan, dl);
                        }
-                       (*dl)[memb->user] = ServerInstance->Time() + ConvToInt(memb->chan->GetModeParameter(&kr));
+                       (*dl)[memb->user->uuid] = ServerInstance->Time() + ConvToInt(memb->chan->GetModeParameter(&kr));
                }
        }
 
-       ~ModuleKickNoRejoin()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Channel mode to delay rejoin after kick", VF_VENDOR);
        }
 };
 
-
 MODULE_INIT(ModuleKickNoRejoin)