X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=8196d37ba6299a01f509c9ed70279a2a99fcec9c;hb=72555992d16af9a1ca28ada1dc70591fb7653dfe;hp=803156446a2e50d86e544a204f16f1097cc6dfdf;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 803156446..8196d37ba 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>";
 	}
@@ -75,6 +97,12 @@ class CommandTban : public Command
 		if (!isextban && !InspIRCd::IsValidMask(mask))
 			mask.append("!*@*");
 
+		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
@@ -90,6 +118,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
@@ -134,6 +163,22 @@ class BanWatcher : public ModeWatcher
 	}
 };
 
+class ChannelMatcher
+{
+	Channel* const chan;
+
+ public:
+	ChannelMatcher(Channel* ch)
+		: chan(ch)
+	{
+	}
+
+	bool operator()(const TimedBan& tb) const
+	{
+		return (tb.chan == chan);
+	}
+};
+
 class ModuleTimedBans : public Module
 {
 	CommandTban cmd;
@@ -179,6 +224,12 @@ class ModuleTimedBans : public Module
 		}
 	}
 
+	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);