Some more text fixes and improvements (#1618).

[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 874e6440f81495986d66d433dc02cbdcc32fb984..a17d3111671b14aaed29e6317bf204419170ffc8 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -45,6 +45,8 @@ class CommandTban : public Command
        bool IsBanSet(Channel* chan, const std::string& mask)
        {
                ListModeBase* banlm = static_cast<ListModeBase*>(*banmode);
+               if (!banlm)
+                       return false;
                const ListModeBase::ModeList* bans = banlm->GetList(chan);
                if (bans)
                {
@@ -66,15 +68,15 @@ class CommandTban : public Command
                syntax = "<channel> <duration> <banmask>";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       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;
                }
-               int cm = channel->GetPrefixValue(user);
+               unsigned int cm = channel->GetPrefixValue(user);
                if (cm < HALFOP_VALUE)
                {
                        user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, "You do not have permission to set bans on this channel");
@@ -82,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))
@@ -105,27 +107,29 @@ 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;
                TimedBanList.push_back(T);
 
+               const std::string addban = user->nick + " added a timed ban on " + mask + " lasting for " + InspIRCd::DurationString(duration) + ".";
                // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
-               ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
-               char pfxchar = (mh && mh->name == "halfop") ? '%' : '@';
+               PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
+               char pfxchar = (mh && mh->name == "halfop") ? mh->GetPrefix() : '@';
 
-               channel->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration);
+               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)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }
@@ -139,7 +143,7 @@ class BanWatcher : public ModeWatcher
        {
        }
 
-       void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding)
+       void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding) CXX11_OVERRIDE
        {
                if (adding)
                        return;
@@ -206,10 +210,14 @@ class ModuleTimedBans : public Module
                        std::string mask = i->mask;
                        Channel* cr = i->chan;
                        {
-                               CUList empty;
-                               std::string expiry = "*** Timed ban on " + cr->name + " expired.";
-                               cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
-                               ServerInstance->PI->SendChannelNotice(cr, '@', expiry);
+                               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() : '@';
+
+                               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;
                                setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask);
@@ -218,7 +226,7 @@ class ModuleTimedBans : public Module
                }
        }
 
-       void OnChannelDelete(Channel* chan)
+       void OnChannelDelete(Channel* chan) CXX11_OVERRIDE
        {
                // Remove all timed bans affecting the channel from internal bookkeeping
                TimedBanList.erase(std::remove_if(TimedBanList.begin(), TimedBanList.end(), ChannelMatcher(chan)), TimedBanList.end());
@@ -226,7 +234,7 @@ class ModuleTimedBans : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Adds timed bans", VF_COMMON | VF_VENDOR);
+               return Version("Provides the TBAN command, timed channel bans", VF_COMMON | VF_VENDOR);
        }
 };