X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_timedbans.cpp;h=bbbc518bdd1b7a7947464c43b83a8942ea2c7d2f;hb=8f83c6709fa531e4d1ff323eb35cd6d394419b17;hp=61095d6ebae2f2ed70ce316ff21c1f1f66fc2024;hpb=9375c633371ee8d25adc5cf756590077e5100bb5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 61095d6eb..bbbc518bd 100644
--- 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
 		ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
 		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
 				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);
+				const std::string expiry = "*** Timed ban on " + chan + " expired.";
+				// 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") ? 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);
 
 				ServerInstance->SendGlobalMode(setban, ServerInstance->FakeClient);
 			}