X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=8a627b9a6c1d9fcd02bae06b23e8dda4b2a6eb72;hb=f9fd78c01623514a060c607534fc52cb73140200;hp=0801c9c52a3c62f829fabb95834720a49eb4a99a;hpb=992674362c5f64bdb8e1942eeaa7612524529cd6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 0801c9c52..8a627b9a6 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -21,6 +21,7 @@
 
 
 #include "inspircd.h"
+#include "listmode.h"
 
 /** Holds a timed ban
  */
@@ -30,6 +31,7 @@ class TimedBan
 	std::string channel;
 	std::string mask;
 	time_t expire;
+	Channel* chan;
 };
 
 typedef std::vector<TimedBan> timedbans;
@@ -39,8 +41,28 @@ timedbans TimedBanList;
  */
 class CommandTban : public Command
 {
+	ChanModeReference banmode;
+
+	bool IsBanSet(Channel* chan, const std::string& mask)
+	{
+		ListModeBase* banlm = static_cast<ListModeBase*>(*banmode);
+		const ListModeBase::ModeList* bans = banlm->GetList(chan);
+		if (bans)
+		{
+			for (ListModeBase::ModeList::const_iterator i = bans->begin(); i != bans->end(); ++i)
+			{
+				const ListModeBase::ListItem& ban = *i;
+				if (!strcasecmp(ban.mask.c_str(), mask.c_str()))
+					return true;
+			}
+		}
+
+		return false;
+	}
+
  public:
 	CommandTban(Module* Creator) : Command(Creator,"TBAN", 3)
+		, banmode(Creator, "ban")
 	{
 		syntax = "<channel> <duration> <banmask>";
 	}
@@ -50,14 +72,13 @@ class CommandTban : public Command
 		Channel* channel = ServerInstance->FindChan(parameters[0]);
 		if (!channel)
 		{
-			user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
+			user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
 			return CMD_FAILURE;
 		}
 		int cm = channel->GetPrefixValue(user);
 		if (cm < HALFOP_VALUE)
 		{
-			user->WriteNumeric(482, "%s %s :You do not have permission to set bans on this channel",
-				user->nick.c_str(), channel->name.c_str());
+			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, "You do not have permission to set bans on this channel");
 			return CMD_FAILURE;
 		}
 
@@ -71,17 +92,21 @@ class CommandTban : public Command
 			return CMD_FAILURE;
 		}
 		std::string mask = parameters[2];
-		std::vector<std::string> setban;
-		setban.push_back(parameters[0]);
-		setban.push_back("+b");
 		bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
-		if (!isextban && !ServerInstance->IsValidMask(mask))
+		if (!isextban && !InspIRCd::IsValidMask(mask))
 			mask.append("!*@*");
 
-		setban.push_back(mask);
+		if (IsBanSet(channel, mask))
+		{
+			user->WriteNotice("Ban already set");
+			return CMD_FAILURE;
+		}
+
+		Modes::ChangeList setban;
+		setban.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), 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);
+		ServerInstance->Modes->Process(user, channel, NULL, setban);
 		if (ServerInstance->Modes->GetLastParse().empty())
 		{
 			user->WriteNotice("Invalid ban mask");
@@ -92,6 +117,7 @@ class CommandTban : public Command
 		T.channel = channelname;
 		T.mask = mask;
 		T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
+		T.chan = channel;
 		TimedBanList.push_back(T);
 
 		// If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
@@ -136,26 +162,32 @@ class BanWatcher : public ModeWatcher
 	}
 };
 
-class ModuleTimedBans : public Module
+class ChannelMatcher
 {
-	CommandTban cmd;
-	BanWatcher banwatcher;
+	Channel* const chan;
 
  public:
-	ModuleTimedBans()
-		: cmd(this)
-		, banwatcher(this)
+	ChannelMatcher(Channel* ch)
+		: chan(ch)
 	{
 	}
 
-	void init() CXX11_OVERRIDE
+	bool operator()(const TimedBan& tb) const
 	{
-		ServerInstance->Modes->AddModeWatcher(&banwatcher);
+		return (tb.chan == chan);
 	}
+};
+
+class ModuleTimedBans : public Module
+{
+	CommandTban cmd;
+	BanWatcher banwatcher;
 
-	~ModuleTimedBans()
+ public:
+	ModuleTimedBans()
+		: cmd(this)
+		, banwatcher(this)
 	{
-		ServerInstance->Modes->DelModeWatcher(&banwatcher);
 	}
 
 	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
@@ -179,21 +211,24 @@ class ModuleTimedBans : public Module
 			Channel* cr = ServerInstance->FindChan(chan);
 			if (cr)
 			{
-				std::vector<std::string> setban;
-				setban.push_back(chan);
-				setban.push_back("-b");
-				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);
 
-				ServerInstance->Modes->Process(setban, ServerInstance->FakeClient);
+				Modes::ChangeList setban;
+				setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask);
+				ServerInstance->Modes->Process(ServerInstance->FakeClient, cr, NULL, setban);
 			}
 		}
 	}
 
+	void OnChannelDelete(Channel* chan)
+	{
+		// Remove all timed bans affecting the channel from internal bookkeeping
+		TimedBanList.erase(std::remove_if(TimedBanList.begin(), TimedBanList.end(), ChannelMatcher(chan)), TimedBanList.end());
+	}
+
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Adds timed bans", VF_COMMON | VF_VENDOR);