X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=a3ee9b525e33941ab651290fd183f4419da190bf;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=663a43f2fec560958eb6dea3180b0136ecc0894f;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 663a43f2f..a3ee9b525 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -63,39 +63,45 @@ class CommandTban : public Command
 				user->nick.c_str(), channel->name.c_str());
 			return CMD_FAILURE;
 		}
-		if (!ServerInstance->IsValidMask(parameters[2]))
-		{
-			user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
-			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 "+std::string(user->nick)+" :Invalid ban time");
+			user->WriteServ("NOTICE "+user->nick+" :Invalid ban time");
 			return CMD_FAILURE;
 		}
 		std::string mask = parameters[2];
 		std::vector<std::string> setban;
 		setban.push_back(parameters[0]);
 		setban.push_back("+b");
-		setban.push_back(parameters[2]);
-		// use CallCommandHandler to make it so that the user sets the mode
+		bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
+		if (!isextban && !ServerInstance->IsValidMask(mask))
+			mask.append("!*@*");
+
+		setban.push_back(mask);
+		// use CallHandler to make it so that the user sets the mode
 		// themselves
-		ServerInstance->CallCommandHandler("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:
+		ServerInstance->Parser->CallHandler("MODE",setban,user);
+		if (ServerInstance->Modes->GetLastParse().empty())
+		{
+			user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
+			return CMD_FAILURE;
+		}
+
 		CUList tmp;
 		T.channel = channelname;
 		T.mask = mask;
 		T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
 		TimedBanList.push_back(T);
-		channel->WriteAllExcept(ServerInstance->FakeClient, true, '@', 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);
+
+		// 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") ? '%' : '@';
+
+		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);
 		return CMD_SUCCESS;
 	}
 
@@ -105,29 +111,22 @@ found:
 	}
 };
 
-class ModuleTimedBans : public Module
+class BanWatcher : public ModeWatcher
 {
-	CommandTban cmd;
  public:
-	ModuleTimedBans()
-		: cmd(this)
+	BanWatcher(Module* parent)
+		: ModeWatcher(parent, 'b', MODETYPE_CHANNEL)
 	{
-		ServerInstance->AddCommand(&cmd);
-		TimedBanList.clear();
-		Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	virtual ~ModuleTimedBans()
+	void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding, ModeType type)
 	{
-		TimedBanList.clear();
-	}
+		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();
@@ -137,7 +136,32 @@ class ModuleTimedBans : public Module
 				break;
 			}
 		}
-		return MOD_RES_PASSTHRU;
+	}
+};
+
+class ModuleTimedBans : public Module
+{
+	CommandTban cmd;
+	BanWatcher banwatcher;
+
+ public:
+	ModuleTimedBans()
+		: cmd(this)
+		, banwatcher(this)
+	{
+	}
+
+	void init()
+	{
+		ServerInstance->Modules->AddService(cmd);
+		Implementation eventlist[] = { I_OnBackgroundTimer };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		ServerInstance->Modes->AddModeWatcher(&banwatcher);
+	}
+
+	~ModuleTimedBans()
+	{
+		ServerInstance->Modes->DelModeWatcher(&banwatcher);
 	}
 
 	virtual void OnBackgroundTimer(time_t curtime)
@@ -183,4 +207,3 @@ class ModuleTimedBans : public Module
 };
 
 MODULE_INIT(ModuleTimedBans)
-