X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=a17d3111671b14aaed29e6317bf204419170ffc8;hb=f6b33a8facd6ca200292786c1061782c41cdd278;hp=2decc2d3a584e282e8101e814646fe63e9ab7ef2;hpb=026c579e4cac7d4545b3c8c3a0d690c8509dc713;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 2decc2d3a..a17d31116 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -68,7 +68,7 @@ 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)
@@ -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,29 +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 " + ConvToStr(duration) + " seconds.";
+		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
 		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;
@@ -234,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);
 	}
 };