Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

[user/henk/code/inspircd.git] / src / modules / m_timedbans.cpp

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index ccefe606a19c738f00930ec8d71ecd978c18ffc3..8a627b9a6c1d9fcd02bae06b23e8dda4b2a6eb72 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -20,9 +20,8 @@
  */
 
 
-/* $ModDesc: Adds timed bans */
-
 #include "inspircd.h"
+#include "listmode.h"
 
 /** Holds a timed ban
  */
@@ -32,6 +31,7 @@ class TimedBan
        std::string channel;
        std::string mask;
        time_t expire;
+       Channel* chan;
 };
 
 typedef std::vector<TimedBan> timedbans;
@@ -41,11 +41,30 @@ timedbans TimedBanList;
  */
 class CommandTban : public Command
 {
+       ChanModeReference banmode;
+
+       bool IsBanSet(Channel* chan, const std::string& mask)
+       {
+               ListModeBase* banlm = static_cast<ListModeBase*>(*banmode);
+               const ListModeBase::ModeList* bans = banlm->GetList(chan);
+               if (bans)
+               {
+                       for (ListModeBase::ModeList::const_iterator i = bans->begin(); i != bans->end(); ++i)
+                       {
+                               const ListModeBase::ListItem& ban = *i;
+                               if (!strcasecmp(ban.mask.c_str(), mask.c_str()))
+                                       return true;
+                       }
+               }
+
+               return false;
+       }
+
  public:
        CommandTban(Module* Creator) : Command(Creator,"TBAN", 3)
+               , banmode(Creator, "ban")
        {
                syntax = "<channel> <duration> <banmask>";
-               TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -53,14 +72,13 @@ class CommandTban : public Command
                Channel* channel = ServerInstance->FindChan(parameters[0]);
                if (!channel)
                {
-                       user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
+                       user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
                        return CMD_FAILURE;
                }
                int cm = channel->GetPrefixValue(user);
                if (cm < HALFOP_VALUE)
                {
-                       user->WriteNumeric(482, "%s %s :You do not have permission to set bans on this channel",
-                               user->nick.c_str(), channel->name.c_str());
+                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, "You do not have permission to set bans on this channel");
                        return CMD_FAILURE;
                }
 
@@ -74,17 +92,21 @@ class CommandTban : public Command
                        return CMD_FAILURE;
                }
                std::string mask = parameters[2];
-               std::vector<std::string> setban;
-               setban.push_back(parameters[0]);
-               setban.push_back("+b");
                bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
-               if (!isextban && !ServerInstance->IsValidMask(mask))
+               if (!isextban && !InspIRCd::IsValidMask(mask))
                        mask.append("!*@*");
 
-               setban.push_back(mask);
-               // use CallHandler to make it so that the user sets the mode
-               // themselves
-               ServerInstance->Parser->CallHandler("MODE",setban,user);
+               if (IsBanSet(channel, mask))
+               {
+                       user->WriteNotice("Ban already set");
+                       return CMD_FAILURE;
+               }
+
+               Modes::ChangeList setban;
+               setban.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask);
+               // Pass the user (instead of ServerInstance->FakeClient) to ModeHandler::Process() to
+               // make it so that the user sets the mode themselves
+               ServerInstance->Modes->Process(user, channel, NULL, setban);
                if (ServerInstance->Modes->GetLastParse().empty())
                {
                        user->WriteNotice("Invalid ban mask");
@@ -95,6 +117,7 @@ class CommandTban : public Command
                T.channel = channelname;
                T.mask = mask;
                T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
+               T.chan = channel;
                TimedBanList.push_back(T);
 
                // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
@@ -115,11 +138,11 @@ class BanWatcher : public ModeWatcher
 {
  public:
        BanWatcher(Module* parent)
-               : ModeWatcher(parent, 'b', MODETYPE_CHANNEL)
+               : ModeWatcher(parent, "ban", MODETYPE_CHANNEL)
        {
        }
 
-       void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding, ModeType type)
+       void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding)
        {
                if (adding)
                        return;
@@ -139,32 +162,35 @@ class BanWatcher : public ModeWatcher
        }
 };
 
-class ModuleTimedBans : public Module
+class ChannelMatcher
 {
-       CommandTban cmd;
-       BanWatcher banwatcher;
+       Channel* const chan;
 
  public:
-       ModuleTimedBans()
-               : cmd(this)
-               , banwatcher(this)
+       ChannelMatcher(Channel* ch)
+               : chan(ch)
        {
        }
 
-       void init()
+       bool operator()(const TimedBan& tb) const
        {
-               ServerInstance->Modules->AddService(cmd);
-               Implementation eventlist[] = { I_OnBackgroundTimer };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-               ServerInstance->Modes->AddModeWatcher(&banwatcher);
+               return (tb.chan == chan);
        }
+};
+
+class ModuleTimedBans : public Module
+{
+       CommandTban cmd;
+       BanWatcher banwatcher;
 
-       ~ModuleTimedBans()
+ public:
+       ModuleTimedBans()
+               : cmd(this)
+               , banwatcher(this)
        {
-               ServerInstance->Modes->DelModeWatcher(&banwatcher);
        }
 
-       virtual void OnBackgroundTimer(time_t curtime)
+       void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
        {
                timedbans expired;
                for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();)
@@ -185,22 +211,25 @@ class ModuleTimedBans : public Module
                        Channel* cr = ServerInstance->FindChan(chan);
                        if (cr)
                        {
-                               std::vector<std::string> setban;
-                               setban.push_back(chan);
-                               setban.push_back("-b");
-                               setban.push_back(mask);
-
                                CUList empty;
                                std::string expiry = "*** Timed ban on " + chan + " expired.";
                                cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
                                ServerInstance->PI->SendChannelNotice(cr, '@', expiry);
 
-                               ServerInstance->SendGlobalMode(setban, ServerInstance->FakeClient);
+                               Modes::ChangeList setban;
+                               setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask);
+                               ServerInstance->Modes->Process(ServerInstance->FakeClient, cr, NULL, setban);
                        }
                }
        }
 
-       virtual Version GetVersion()
+       void OnChannelDelete(Channel* chan)
+       {
+               // Remove all timed bans affecting the channel from internal bookkeeping
+               TimedBanList.erase(std::remove_if(TimedBanList.begin(), TimedBanList.end(), ChannelMatcher(chan)), TimedBanList.end());
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Adds timed bans", VF_COMMON | VF_VENDOR);
        }