Merge tag 'v2.0.25' into master.

[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 9890800e4c524f4222080cedc30474e85c0455af..8c1454d7ed2a0fba80809aefa3b39e8a5357288b 100644 (file)
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -117,11 +117,13 @@ class CommandTban : public Command
                T.chan = channel;
                TimedBanList.push_back(T);
 
+               const std::string addban = user->nick + " added a timed ban on " + mask + " lasting for " + ConvToStr(duration) + " seconds.";
                // 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() : '@';
 
-               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);
+               channel->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, tmp, "NOTICE %s :%s", channel->name.c_str(), addban.c_str());
+               ServerInstance->PI->SendChannelNotice(channel, pfxchar, addban);
                return CMD_SUCCESS;
        }
 
@@ -207,9 +209,13 @@ class ModuleTimedBans : public Module
                        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() : '@';
+
+                               cr->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
+                               ServerInstance->PI->SendChannelNotice(cr, pfxchar, expiry);
 
                                Modes::ChangeList setban;
                                setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask);