Add the override keyword in places that it is missing.

[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 ce95085d85c234a55b19e2ed5750b4a047f16ef4..1bc11948c0c65a964eaef9b1d0777ab066c0716d 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -25,45 +25,94 @@
 
 #include "inspircd.h"
 
-typedef std::map<std::string, time_t> delaylist;
+class KickRejoinData
+{
+       struct KickedUser
+       {
+               std::string uuid;
+               time_t expire;
+
+               KickedUser(User* user, unsigned int Delay)
+                       : uuid(user->uuid)
+                       , expire(ServerInstance->Time() + Delay)
+               {
+               }
+       };
+
+       typedef std::vector<KickedUser> KickedList;
+
+       mutable KickedList kicked;
+
+ public:
+       const unsigned int delay;
+
+       KickRejoinData(unsigned int Delay) : delay(Delay) { }
+
+       bool canjoin(LocalUser* user) const
+       {
+               for (KickedList::iterator i = kicked.begin(); i != kicked.end(); )
+               {
+                       KickedUser& rec = *i;
+                       if (rec.expire > ServerInstance->Time())
+                       {
+                               if (rec.uuid == user->uuid)
+                                       return false;
+                               ++i;
+                       }
+                       else
+                       {
+                               // Expired record, remove.
+                               stdalgo::vector::swaperase(kicked, i);
+                               if (kicked.empty())
+                                       break;
+                       }
+               }
+               return true;
+       }
+
+       void add(User* user)
+       {
+               // One user can be in the list multiple times if the user gets kicked, force joins
+               // (skipping OnUserPreJoin) and gets kicked again, but that's okay because canjoin()
+               // works correctly in this case as well
+               kicked.push_back(KickedUser(user, delay));
+       }
+};
 
 /** Handles channel mode +J
  */
-class KickRejoin : public ModeHandler
+class KickRejoin : public ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >
 {
-       static const unsigned int max = 60;
+       const unsigned int max;
  public:
-       SimpleExtItem<delaylist> ext;
        KickRejoin(Module* Creator)
-               : ModeHandler(Creator, "kicknorejoin", 'J', PARAM_SETONLY, MODETYPE_CHANNEL)
-               , ext("norejoinusers", Creator)
+               : ParamMode<KickRejoin, SimpleExtItem<KickRejoinData> >(Creator, "kicknorejoin", 'J')
+               , max(60)
        {
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
+       ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE
        {
-               if (adding)
-               {
-                       int v = ConvToInt(parameter);
-                       if (v <= 0)
-                               return MODEACTION_DENY;
-                       if (parameter == channel->GetModeParameter(this))
-                               return MODEACTION_DENY;
+               int v = ConvToInt(parameter);
+               if (v <= 0)
+                       return MODEACTION_DENY;
 
-                       if ((IS_LOCAL(source) && ((unsigned int)v > max)))
-                               v = max;
+               if ((IS_LOCAL(source) && ((unsigned int)v > max)))
+                       v = max;
 
-                       parameter = ConvToStr(v);
-               }
-               else
-               {
-                       if (!channel->IsModeSet(this))
-                               return MODEACTION_DENY;
-
-                       ext.unset(channel);
-               }
+               ext.set(channel, new KickRejoinData(v));
                return MODEACTION_ALLOW;
        }
+
+       void SerializeParam(Channel* chan, const KickRejoinData* krd, std::string& out)
+       {
+               out.append(ConvToStr(krd->delay));
+       }
+
+       std::string GetModuleSettings() const
+       {
+               return ConvToStr(max);
+       }
 };
 
 class ModuleKickNoRejoin : public Module
@@ -80,31 +129,11 @@ public:
        {
                if (chan)
                {
-                       delaylist* dl = kr.ext.get(chan);
-                       if (dl)
+                       const KickRejoinData* data = kr.ext.get(chan);
+                       if ((data) && (!data->canjoin(user)))
                        {
-                               for (delaylist::iterator iter = dl->begin(); iter != dl->end(); )
-                               {
-                                       if (iter->second > ServerInstance->Time())
-                                       {
-                                               if (iter->first == user->uuid)
-                                               {
-                                                       std::string modeparam = chan->GetModeParameter(&kr);
-                                                       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;
-                                       }
-                                       else
-                                       {
-                                               // Expired record, remove.
-                                               dl->erase(iter++);
-                                       }
-                               }
-
-                               if (dl->empty())
-                                       kr.ext.unset(chan);
+                               user->WriteNumeric(ERR_DELAYREJOIN, chan, InspIRCd::Format("You must wait %u seconds after being kicked to rejoin (+J)", data->delay));
+                               return MOD_RES_DENY;
                        }
                }
                return MOD_RES_PASSTHRU;
@@ -112,21 +141,19 @@ public:
 
        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))
+               if ((!IS_LOCAL(memb->user)) || (source == memb->user))
+                       return;
+
+               KickRejoinData* data = kr.ext.get(memb->chan);
+               if (data)
                {
-                       delaylist* dl = kr.ext.get(memb->chan);
-                       if (!dl)
-                       {
-                               dl = new delaylist;
-                               kr.ext.set(memb->chan, dl);
-                       }
-                       (*dl)[memb->user->uuid] = ServerInstance->Time() + ConvToInt(memb->chan->GetModeParameter(&kr));
+                       data->add(memb->user);
                }
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Channel mode to delay rejoin after kick", VF_VENDOR);
+               return Version("Channel mode to delay rejoin after kick", VF_VENDOR | VF_COMMON, kr.GetModuleSettings());
        }
 };