X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=29691b338b54161f6e0dcf6d7b9707f9696ab142;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=497ac2569d94ad80528656a1c4a1de345ab339d4;hpb=5513496d5f01278221d7de5e3bf6b3f25b66c0d0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 497ac2569..29691b338 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -20,8 +20,6 @@
  */
 
 
-/* $ModDesc: Adds timed bans */
-
 #include "inspircd.h"
 
 /** Holds a timed ban
@@ -45,7 +43,6 @@ class CommandTban : public Command
 	CommandTban(Module* Creator) : Command(Creator,"TBAN", 3)
 	{
 		syntax = "<channel> <duration> <banmask>";
-		TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -62,15 +59,15 @@ class CommandTban : public Command
 			user->WriteNumeric(482, "%s %s :You do not have permission to set bans on this channel",
 				user->nick.c_str(), channel->name.c_str());
 			return CMD_FAILURE;
-		}		
+		}
 
 		TimedBan T;
 		std::string channelname = parameters[0];
-		long duration = ServerInstance->Duration(parameters[1]);
+		unsigned long duration = InspIRCd::Duration(parameters[1]);
 		unsigned long expire = duration + ServerInstance->Time();
 		if (duration < 1)
 		{
-			user->WriteServ("NOTICE "+user->nick+" :Invalid ban time");
+			user->WriteNotice("Invalid ban time");
 			return CMD_FAILURE;
 		}
 		std::string mask = parameters[2];
@@ -80,20 +77,17 @@ class CommandTban : public Command
 		bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
 		if (!isextban && !ServerInstance->IsValidMask(mask))
 			mask.append("!*@*");
-		if ((mask.length() > 250) || (!ServerInstance->IsValidMask(mask) && !isextban))
+
+		setban.push_back(mask);
+		// Pass the user (instead of ServerInstance->FakeClient) to ModeHandler::Process() to
+		// make it so that the user sets the mode themselves
+		ServerInstance->Modes->Process(setban, user);
+		if (ServerInstance->Modes->GetLastParse().empty())
 		{
-			user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
+			user->WriteNotice("Invalid ban mask");
 			return CMD_FAILURE;
 		}
-		setban.push_back(mask);
-		// use CallHandler to make it so that the user sets the mode
-		// themselves
-		ServerInstance->Parser->CallHandler("MODE",setban,user);
-		for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
-			if (!strcasecmp(i->data.c_str(), mask.c_str()))
-				goto found;
-		return CMD_FAILURE;
-found:
+
 		CUList tmp;
 		T.channel = channelname;
 		T.mask = mask;
@@ -114,27 +108,22 @@ found:
 	}
 };
 
-class ModuleTimedBans : public Module
+class BanWatcher : public ModeWatcher
 {
-	CommandTban cmd;
  public:
-	ModuleTimedBans()
-		: cmd(this)
+	BanWatcher(Module* parent)
+		: ModeWatcher(parent, "ban", MODETYPE_CHANNEL)
 	{
 	}
 
-	void init()
+	void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding)
 	{
-		ServerInstance->Modules->AddService(cmd);
-		Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
+		if (adding)
+			return;
 
-	virtual ModResult OnDelBan(User* source, Channel* chan, const std::string &banmask)
-	{
 		irc::string listitem = banmask.c_str();
 		irc::string thischan = chan->name.c_str();
-		for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end(); i++)
+		for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end(); ++i)
 		{
 			irc::string target = i->mask.c_str();
 			irc::string tchan = i->channel.c_str();
@@ -144,10 +133,33 @@ class ModuleTimedBans : public Module
 				break;
 			}
 		}
-		return MOD_RES_PASSTHRU;
+	}
+};
+
+class ModuleTimedBans : public Module
+{
+	CommandTban cmd;
+	BanWatcher banwatcher;
+
+ public:
+	ModuleTimedBans()
+		: cmd(this)
+		, banwatcher(this)
+	{
 	}
 
-	virtual void OnBackgroundTimer(time_t curtime)
+	void init() CXX11_OVERRIDE
+	{
+		ServerInstance->Modules->AddService(cmd);
+		ServerInstance->Modes->AddModeWatcher(&banwatcher);
+	}
+
+	~ModuleTimedBans()
+	{
+		ServerInstance->Modes->DelModeWatcher(&banwatcher);
+	}
+
+	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
 	{
 		timedbans expired;
 		for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();)
@@ -178,16 +190,15 @@ class ModuleTimedBans : public Module
 				cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
 				ServerInstance->PI->SendChannelNotice(cr, '@', expiry);
 
-				ServerInstance->SendGlobalMode(setban, ServerInstance->FakeClient);
+				ServerInstance->Modes->Process(setban, ServerInstance->FakeClient);
 			}
 		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Adds timed bans", VF_COMMON | VF_VENDOR);
 	}
 };
 
 MODULE_INIT(ModuleTimedBans)
-