1 files changed, 85 insertions, 82 deletions

diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index bbbc518bd..a17d31116 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -20,16 +20,14 @@
  */
 
 
-/* $ModDesc: Adds timed bans */
-
 #include "inspircd.h"
+#include "listmode.h"
 
 /** Holds a timed ban
  */
 class TimedBan
 {
  public:
-	std::string channel;
 	std::string mask;
 	time_t expire;
 	Channel* chan;
@@ -42,97 +40,129 @@ timedbans TimedBanList;
  */
 class CommandTban : public Command
 {
-	static bool IsBanSet(Channel* chan, const std::string& mask)
+	ChanModeReference banmode;
+
+	bool IsBanSet(Channel* chan, const std::string& mask)
 	{
-		for (BanList::const_iterator i = chan->bans.begin(); i != chan->bans.end(); ++i)
+		ListModeBase* banlm = static_cast<ListModeBase*>(*banmode);
+		if (!banlm)
+			return false;
+		const ListModeBase::ModeList* bans = banlm->GetList(chan);
+		if (bans)
 		{
-			if (!strcasecmp(i->data.c_str(), mask.c_str()))
-				return true;
+			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>";
-		TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		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::NoSuchChannel(parameters[0]));
 			return CMD_FAILURE;
 		}
-		int cm = channel->GetPrefixValue(user);
+		unsigned 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;
-		}		
+		}
 
 		TimedBan T;
-		std::string channelname = parameters[0];
-		long duration = ServerInstance->Duration(parameters[1]);
-		unsigned long expire = duration + ServerInstance->Time();
-		if (duration < 1)
+		unsigned long duration;
+		if (!InspIRCd::Duration(parameters[1], duration))
 		{
-			user->WriteServ("NOTICE "+user->nick+" :Invalid ban time");
+			user->WriteNotice("Invalid ban time");
 			return CMD_FAILURE;
 		}
+		unsigned long expire = duration + ServerInstance->Time();
 		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("!*@*");
-		if ((mask.length() > 250) || (!ServerInstance->IsValidMask(mask) && !isextban))
-		{
-			user->WriteServ("NOTICE "+user->nick+" :Invalid ban mask");
-			return CMD_FAILURE;
-		}
 
 		if (IsBanSet(channel, mask))
 		{
-			user->WriteServ("NOTICE %s :Ban already set", user->nick.c_str());
+			user->WriteNotice("Ban already set");
 			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);
-		if (!IsBanSet(channel, mask))
+		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(user, channel, NULL, setban);
+		if (ServerInstance->Modes->GetLastChangeList().empty())
+		{
+			user->WriteNotice("Invalid ban mask");
 			return CMD_FAILURE;
+		}
 
-		CUList tmp;
-		T.channel = channelname;
 		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
-		ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
+		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)
+	RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
 		return ROUTE_BROADCAST;
 	}
 };
 
+class BanWatcher : public ModeWatcher
+{
+ public:
+	BanWatcher(Module* parent)
+		: ModeWatcher(parent, "ban", MODETYPE_CHANNEL)
+	{
+	}
+
+	void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding) CXX11_OVERRIDE
+	{
+		if (adding)
+			return;
+
+		for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end(); ++i)
+		{
+			if (i->chan != chan)
+				continue;
+
+			const std::string& target = i->mask;
+			if (irc::equals(banmask, target))
+			{
+				TimedBanList.erase(i);
+				break;
+			}
+		}
+	}
+};
+
 class ChannelMatcher
 {
 	Channel* const chan;
@@ -152,37 +182,16 @@ class ChannelMatcher
 class ModuleTimedBans : public Module
 {
 	CommandTban cmd;
+	BanWatcher banwatcher;
+
  public:
 	ModuleTimedBans()
 		: cmd(this)
+		, banwatcher(this)
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(cmd);
-		Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer, I_OnChannelDelete };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	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++)
-		{
-			irc::string target = i->mask.c_str();
-			irc::string tchan = i->channel.c_str();
-			if ((listitem == target) && (tchan == thischan))
-			{
-				TimedBanList.erase(i);
-				break;
-			}
-		}
-		return MOD_RES_PASSTHRU;
-	}
-
-	virtual void OnBackgroundTimer(time_t curtime)
+	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
 	{
 		timedbans expired;
 		for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();)
@@ -198,41 +207,35 @@ class ModuleTimedBans : public Module
 
 		for (timedbans::iterator i = expired.begin(); i != expired.end(); i++)
 		{
-			std::string chan = i->channel;
 			std::string mask = i->mask;
-			Channel* cr = ServerInstance->FindChan(chan);
-			if (cr)
+			Channel* cr = i->chan;
 			{
-				std::vector<std::string> setban;
-				setban.push_back(chan);
-				setban.push_back("-b");
-				setban.push_back(mask);
-
-				CUList empty;
-				const std::string expiry = "*** Timed ban on " + chan + " expired.";
+				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
-				ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
+				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);
 
-				ServerInstance->SendGlobalMode(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)
+	void OnChannelDelete(Channel* chan) CXX11_OVERRIDE
 	{
 		// Remove all timed bans affecting the channel from internal bookkeeping
 		TimedBanList.erase(std::remove_if(TimedBanList.begin(), TimedBanList.end(), ChannelMatcher(chan)), TimedBanList.end());
 	}
 
-	virtual Version GetVersion()
+	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);
 	}
 };
 
 MODULE_INIT(ModuleTimedBans)
-