Allow configuring whether SETNAME sends snotices and is oper-only.

[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 14ef11107c791fc14260d6f63d3d88d9fc3ed584..32b376c7938c776c532611e2f3a59a17842988a4 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -68,12 +68,12 @@ class CommandTban : public Command
                syntax = "<channel> <duration> <banmask>";
        }
 
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                Channel* channel = ServerInstance->FindChan(parameters[0]);
                if (!channel)
                {
-                       user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+                       user->WriteNumeric(Numerics::NoSuchChannel(parameters[0]));
                        return CMD_FAILURE;
                }
                unsigned int cm = channel->GetPrefixValue(user);
@@ -84,13 +84,13 @@ class CommandTban : public Command
                }
 
                TimedBan T;
-               unsigned long duration = InspIRCd::Duration(parameters[1]);
-               unsigned long expire = duration + ServerInstance->Time();
-               if (duration < 1)
+               unsigned long duration;
+               if (!InspIRCd::Duration(parameters[1], duration))
                {
                        user->WriteNotice("Invalid ban time");
                        return CMD_FAILURE;
                }
+               unsigned long expire = duration + ServerInstance->Time();
                std::string mask = parameters[2];
                bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
                if (!isextban && !InspIRCd::IsValidMask(mask))
@@ -107,13 +107,12 @@ class CommandTban : public Command
                // 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())
+               if (ServerInstance->Modes->GetLastChangeList().empty())
                {
                        user->WriteNotice("Invalid ban mask");
                        return CMD_FAILURE;
                }
 
-               CUList tmp;
                T.mask = mask;
                T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
                T.chan = channel;
@@ -124,12 +123,13 @@ class CommandTban : public Command
                PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
                char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
 
-               channel->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, tmp, "NOTICE %s :%s", channel->name.c_str(), addban.c_str());
+               ClientProtocol::Messages::Privmsg notice(ServerInstance->FakeClient, channel, addban, MSG_NOTICE);
+               channel->Write(ServerInstance->GetRFCEvents().privmsg, notice, pfxchar);
                ServerInstance->PI->SendChannelNotice(channel, pfxchar, addban);
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }
@@ -210,13 +210,13 @@ class ModuleTimedBans : public Module
                        std::string mask = i->mask;
                        Channel* cr = i->chan;
                        {
-                               CUList empty;
                                const std::string expiry = "*** Timed ban on " + cr->name + " expired.";
                                // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
                                PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
                                char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
 
-                               cr->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
+                               ClientProtocol::Messages::Privmsg notice(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, cr, expiry, MSG_NOTICE);
+                               cr->Write(ServerInstance->GetRFCEvents().privmsg, notice, pfxchar);
                                ServerInstance->PI->SendChannelNotice(cr, pfxchar, expiry);
 
                                Modes::ChangeList setban;