1 files changed, 119 insertions, 132 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index 6ea52b093..f6d9260e3 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -11,32 +11,35 @@
 
 #include "module.h"
 
-class ChannelModeFlood : public ChannelModeParam
+class ChannelModeFlood final
+	: public ChannelModeParam
 {
- public:
+public:
 	ChannelModeFlood(char modeChar, bool minusNoArg) : ChannelModeParam("FLOOD", modeChar, minusNoArg) { }
 
-	bool IsValid(Anope::string &value) const anope_override
+	bool IsValid(Anope::string &value) const override
 	{
-		try
-		{
-			Anope::string rest;
-			if (!value.empty() && value[0] != ':' && convertTo<int>(value[0] == '*' ? value.substr(1) : value, rest, false) > 0 && rest[0] == ':' && rest.length() > 1 && convertTo<int>(rest.substr(1), rest, false) > 0 && rest.empty())
-				return true;
-		}
-		catch (const ConvertException &) { }
+		if (value.empty() || value[0] == ':')
+			return false;
+
+		Anope::string rest;
+		auto num1 = Anope::Convert<int>(value[0] == '*' ? value.substr(1) : value, 0, &rest);
+		if (num1 <= 0 || rest[0] != ':' || rest.length() <= 1)
+			return false;
 
-		return false;
+		return Anope::Convert<int>(rest.substr(1), 0, &rest) > 0 && rest.empty();
 	}
 };
 
-class BahamutIRCdProto : public IRCDProto
+class BahamutIRCdProto final
+	: public IRCDProto
 {
- public:
-	BahamutIRCdProto(Module *creator) : IRCDProto(creator, "Bahamut 1.8.x")
+public:
+	BahamutIRCdProto(Module *creator) : IRCDProto(creator, "Bahamut 2+")
 	{
 		DefaultPseudoclientModes = "+";
 		CanSVSNick = true;
+		CanSVSNOOP = true;
 		CanSNLine = true;
 		CanSQLine = true;
 		CanSQLineChannel = true;
@@ -45,91 +48,82 @@ class BahamutIRCdProto : public IRCDProto
 		MaxModes = 60;
 	}
 
-	void SendModeInternal(const MessageSource &source, const Channel *dest, const Anope::string &buf) anope_override
+	void SendModeInternal(const MessageSource &source, Channel *chan, const Anope::string &modes, const std::vector<Anope::string> &values) override
 	{
-		if (Servers::Capab.count("TSMODE") > 0)
-		{
-			UplinkSocket::Message(source) << "MODE " << dest->name << " " << dest->creation_time << " " << buf;
-		}
-		else
-			IRCDProto::SendModeInternal(source, dest, buf);
+		auto params = values;
+		params.insert(params.begin(), { chan->name, Anope::ToString(chan->creation_time), modes });
+		Uplink::SendInternal({}, source, "MODE", params);
 	}
 
-	void SendModeInternal(const MessageSource &source, User *u, const Anope::string &buf) anope_override
+	void SendModeInternal(const MessageSource &source, User *u, const Anope::string &modes, const std::vector<Anope::string> &values) override
 	{
-		UplinkSocket::Message(source) << "SVSMODE " << u->nick << " " << u->timestamp << " " << buf;
+		auto params = values;
+		params.insert(params.begin(), { u->nick, Anope::ToString(u->timestamp), modes });
+		Uplink::SendInternal({}, source, "SVSMODE", params);
 	}
 
-	void SendGlobalNotice(BotInfo *bi, const Server *dest, const Anope::string &msg) anope_override
+	void SendGlobalNotice(BotInfo *bi, const Server *dest, const Anope::string &msg) override
 	{
-		UplinkSocket::Message(bi) << "NOTICE $" << dest->GetName() << " :" << msg;
+		Uplink::Send(bi, "NOTICE", "$" + dest->GetName(), msg);
 	}
 
-	void SendGlobalPrivmsg(BotInfo *bi, const Server *dest, const Anope::string &msg) anope_override
+	void SendGlobalPrivmsg(BotInfo *bi, const Server *dest, const Anope::string &msg) override
 	{
-		UplinkSocket::Message(bi) << "PRIVMSG $" << dest->GetName() << " :" << msg;
+		Uplink::Send(bi, "PRIVMSG", "$" + dest->GetName(), msg);
 	}
 
 	/* SVSHOLD - set */
-	void SendSVSHold(const Anope::string &nick, time_t time) anope_override
+	void SendSVSHold(const Anope::string &nick, time_t time) override
 	{
-		UplinkSocket::Message(Me) << "SVSHOLD " << nick << " " << time << " :Being held for registered user";
+		Uplink::Send("SVSHOLD", nick, time, "Being held for a registered user");
 	}
 
 	/* SVSHOLD - release */
-	void SendSVSHoldDel(const Anope::string &nick) anope_override
+	void SendSVSHoldDel(const Anope::string &nick) override
 	{
-		UplinkSocket::Message(Me) << "SVSHOLD " << nick << " 0";
+		Uplink::Send("SVSHOLD", nick, 0);
 	}
 
 	/* SQLINE */
-	void SendSQLine(User *, const XLine *x) anope_override
+	void SendSQLine(User *, const XLine *x) override
 	{
-		UplinkSocket::Message() << "SQLINE " << x->mask << " :" << x->GetReason();
+		Uplink::Send("SQLINE", x->mask, x->reason);
 	}
 
 	/* UNSLINE */
-	void SendSGLineDel(const XLine *x) anope_override
+	void SendSGLineDel(const XLine *x) override
 	{
-		UplinkSocket::Message() << "UNSGLINE 0 :" << x->mask;
+		Uplink::Send("UNSGLINE", 0, x->mask);
 	}
 
 	/* UNSZLINE */
-	void SendSZLineDel(const XLine *x) anope_override
+	void SendSZLineDel(const XLine *x) override
 	{
-		/* this will likely fail so its only here for legacy */
-		UplinkSocket::Message() << "UNSZLINE 0 " << x->GetHost();
-		/* this is how we are supposed to deal with it */
-		UplinkSocket::Message() << "RAKILL " << x->GetHost() << " *";
+		Uplink::Send("RAKILL", x->GetHost(), '*');
 	}
 
 	/* SZLINE */
-	void SendSZLine(User *, const XLine *x) anope_override
+	void SendSZLine(User *, const XLine *x) override
 	{
-		// Calculate the time left before this would expire, capping it at 2 days
-		time_t timeleft = x->expires - Anope::CurTime;
-		if (timeleft > 172800 || !x->expires)
-			timeleft = 172800;
-		/* this will likely fail so its only here for legacy */
-		UplinkSocket::Message() << "SZLINE " << x->GetHost() << " :" << x->GetReason();
-		/* this is how we are supposed to deal with it */
-		UplinkSocket::Message() << "AKILL " << x->GetHost() << " * " << timeleft << " " << x->by << " " << Anope::CurTime << " :" << x->GetReason();
+		// Calculate the time left before this would expire
+		time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
+		Uplink::Send("AKILL", x->GetHost(), '*', timeleft, x->by, Anope::CurTime, x->GetReason());
 	}
 
 	/* SVSNOOP */
-	void SendSVSNOOP(const Server *server, bool set) anope_override
+	void SendSVSNOOP(const Server *server, bool set) override
 	{
-		UplinkSocket::Message() << "SVSNOOP " << server->GetName() << " " << (set ? "+" : "-");
+		Uplink::Send("SVSNOOP", server->GetName(), set ? '+' : '-');
 	}
 
 	/* SGLINE */
-	void SendSGLine(User *, const XLine *x) anope_override
+	void SendSGLine(User *, const XLine *x) override
 	{
-		UplinkSocket::Message() << "SGLINE " << x->mask.length() << " :" << x->mask << ":" << x->GetReason();
+		Uplink::Send("SGLINE", x->mask.length(), x->mask, x->GetReason());
 	}
 
 	/* RAKILL */
-	void SendAkillDel(const XLine *x) anope_override
+	void SendAkillDel(const XLine *x) override
 	{
 		if (x->IsRegex() || x->HasNickOrReal())
 			return;
@@ -145,25 +139,25 @@ class BahamutIRCdProto : public IRCDProto
 			}
 		}
 
-		UplinkSocket::Message() << "RAKILL " << x->GetHost() << " " << x->GetUser();
+		Uplink::Send("RAKILL", x->GetHost(), x->GetUser());
 	}
 
 	/* TOPIC */
-	void SendTopic(const MessageSource &source, Channel *c) anope_override
+	void SendTopic(const MessageSource &source, Channel *c) override
 	{
-		UplinkSocket::Message(source) << "TOPIC " << c->name << " " << c->topic_setter << " " << c->topic_ts << " :" << c->topic;
+		Uplink::Send(source, "TOPIC", c->name, c->topic_setter, c->topic_ts, c->topic);
 	}
 
 	/* UNSQLINE */
-	void SendSQLineDel(const XLine *x) anope_override
+	void SendSQLineDel(const XLine *x) override
 	{
-		UplinkSocket::Message() << "UNSQLINE " << x->mask;
+		Uplink::Send("UNSQLINE", x->mask);
 	}
 
 	/* JOIN - SJOIN */
-	void SendJoin(User *user, Channel *c, const ChannelStatus *status) anope_override
+	void SendJoin(User *user, Channel *c, const ChannelStatus *status) override
 	{
-		UplinkSocket::Message(user) << "SJOIN " << c->creation_time << " " << c->name;
+		Uplink::Send(user, "SJOIN", c->creation_time, c->name);
 		if (status)
 		{
 			/* First save the channel status incase uc->Status == status */
@@ -176,24 +170,24 @@ class BahamutIRCdProto : public IRCDProto
 				uc->status.Clear();
 
 			BotInfo *setter = BotInfo::Find(user->GetUID());
-			for (size_t i = 0; i < cs.Modes().length(); ++i)
-				c->SetMode(setter, ModeManager::FindChannelModeByChar(cs.Modes()[i]), user->GetUID(), false);
+			for (auto mode : cs.Modes())
+				c->SetMode(setter, ModeManager::FindChannelModeByChar(mode), user->GetUID(), false);
 
 			if (uc != NULL)
 				uc->status = cs;
 		}
 	}
 
-	void SendAkill(User *u, XLine *x) anope_override
+	void SendAkill(User *u, XLine *x) override
 	{
 		if (x->IsRegex() || x->HasNickOrReal())
 		{
 			if (!u)
 			{
 				/* No user (this akill was just added), and contains nick and/or realname. Find users that match and ban them */
-				for (user_map::const_iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
-					if (x->manager->Check(it->second, x))
-						this->SendAkill(it->second, x);
+				for (const auto &[_, user] : UserListByNick)
+					if (x->manager->Check(user, x))
+						this->SendAkill(user, x);
 				return;
 			}
 
@@ -220,47 +214,44 @@ class BahamutIRCdProto : public IRCDProto
 			}
 		}
 
-		// Calculate the time left before this would expire, capping it at 2 days
-		time_t timeleft = x->expires - Anope::CurTime;
-		if (timeleft > 172800)
-			timeleft = 172800;
-		UplinkSocket::Message() << "AKILL " << x->GetHost() << " " << x->GetUser() << " " << timeleft << " " << x->by << " " << Anope::CurTime << " :" << x->GetReason();
+		// Calculate the time left before this would expire
+		time_t timeleft = x->expires ? x->expires - Anope::CurTime : x->expires;
+		Uplink::Send("AKILL", x->GetHost(), x->GetUser(), timeleft, x->by, Anope::CurTime, x->reason);
 	}
 
 	/*
 	  Note: if the stamp is null 0, the below usage is correct of Bahamut
 	*/
-	void SendSVSKillInternal(const MessageSource &source, User *user, const Anope::string &buf) anope_override
+	void SendSVSKill(const MessageSource &source, User *user, const Anope::string &buf) override
 	{
-		UplinkSocket::Message(source) << "SVSKILL " << user->nick << " :" << buf;
+		Uplink::Send(source, "SVSKILL", user->nick, buf);
 	}
 
-	void SendBOB() anope_override
+	void SendBOB() override
 	{
-		UplinkSocket::Message() << "BURST";
+		Uplink::Send("BURST");
 	}
 
-	void SendEOB() anope_override
+	void SendEOB() override
 	{
-		UplinkSocket::Message() << "BURST 0";
+		Uplink::Send("BURST", 0);
 	}
 
-	void SendClientIntroduction(User *u) anope_override
+	void SendClientIntroduction(User *u) override
 	{
-		Anope::string modes = "+" + u->GetModes();
-		UplinkSocket::Message() << "NICK " << u->nick << " 1 " << u->timestamp << " " << modes << " " << u->GetIdent() << " " << u->host << " " << u->server->GetName() << " 0 0 :" << u->realname;
+		Uplink::Send("NICK", u->nick, 1, u->timestamp, "+" + u->GetModes(), u->GetIdent(), u->host, u->server->GetName(), 0, "0.0.0.0", u->realname);
 	}
 
 	/* SERVER */
-	void SendServer(const Server *server) anope_override
+	void SendServer(const Server *server) override
 	{
-		UplinkSocket::Message() << "SERVER " << server->GetName() << " " << server->GetHops() << " :" << server->GetDescription();
+		Uplink::Send("SERVER", server->GetName(), server->GetHops(), server->GetDescription());
 	}
 
-	void SendConnect() anope_override
+	void SendConnect() override
 	{
-		UplinkSocket::Message() << "PASS " << Config->Uplinks[Anope::CurrentUplink].password << " :TS";
-		UplinkSocket::Message() << "CAPAB SSJOIN NOQUIT BURST UNCONNECT NICKIP TSMODE TS3";
+		Uplink::Send("PASS", Config->Uplinks[Anope::CurrentUplink].password, "TS");
+		Uplink::Send("CAPAB", "BURST", "NICKIPSTR", "SSJOIN", "UNCONNECT");
 		SendServer(Me);
 		/*
 		 * SVINFO
@@ -270,34 +261,32 @@ class BahamutIRCdProto : public IRCDProto
 		 *	   parv[3] = server is standalone or connected to non-TS only
 		 *	   parv[4] = server's idea of UTC time
 		 */
-		UplinkSocket::Message() << "SVINFO 3 1 0 :" << Anope::CurTime;
+		Uplink::Send("SVINFO", 5, 5, 0, Anope::CurTime);
 		this->SendBOB();
 	}
 
-	void SendChannel(Channel *c) anope_override
+	void SendChannel(Channel *c) override
 	{
-		Anope::string modes = c->GetModes(true, true);
-		if (modes.empty())
-			modes = "+";
-		UplinkSocket::Message() << "SJOIN " << c->creation_time << " " << c->name << " " << modes << " :";
+		Uplink::Send("SJOIN", c->creation_time, c->name, "+" + c->GetModes(true, true), "");
 	}
 
-	void SendLogin(User *u, NickAlias *) anope_override
+	void SendLogin(User *u, NickAlias *) override
 	{
-		IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %d", u->signon);
+		IRCD->SendMode(Config->GetClient("NickServ"), u, "+d", u->signon);
 	}
 
-	void SendLogout(User *u) anope_override
+	void SendLogout(User *u) override
 	{
-		IRCD->SendMode(Config->GetClient("NickServ"), u, "+d 1");
+		IRCD->SendMode(Config->GetClient("NickServ"), u, "+d", 1);
 	}
 };
 
-struct IRCDMessageBurst : IRCDMessage
+struct IRCDMessageBurst final
+	: IRCDMessage
 {
-	IRCDMessageBurst(Module *creator) : IRCDMessage(creator, "BURST", 0) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	IRCDMessageBurst(Module *creator) : IRCDMessage(creator, "BURST", 0) { SetFlag(FLAG_REQUIRE_SERVER); SetFlag(FLAG_SOFT_LIMIT); }
 
-	void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
+	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
 	{
 		/* If we found a server with the given source, that one just
 		 * finished bursting. If there was no source, then our uplink
@@ -311,22 +300,17 @@ struct IRCDMessageBurst : IRCDMessage
 	}
 };
 
-struct IRCDMessageMode : IRCDMessage
+struct IRCDMessageMode final
+	: IRCDMessage
 {
-	IRCDMessageMode(Module *creator, const Anope::string &sname) : IRCDMessage(creator, sname, 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	IRCDMessageMode(Module *creator, const Anope::string &sname) : IRCDMessage(creator, sname, 2) { SetFlag(FLAG_SOFT_LIMIT); }
 
-	void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
+	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
 	{
 		if (params.size() > 2 && IRCD->IsChannelValid(params[0]))
 		{
 			Channel *c = Channel::Find(params[0]);
-			time_t ts = 0;
-
-			try
-			{
-				ts = convertTo<time_t>(params[1]);
-			}
-			catch (const ConvertException &) { }
+			auto ts = IRCD->ExtractTimestamp(params[1]);
 
 			Anope::string modes = params[2];
 			for (unsigned int i = 3; i < params.size(); ++i)
@@ -339,7 +323,7 @@ struct IRCDMessageMode : IRCDMessage
 		{
 			User *u = User::Find(params[0]);
 			if (u)
-				u->SetModesInternal(source, "%s", params[1].c_str());
+				u->SetModesInternal(source, params[1]);
 		}
 	}
 };
@@ -362,11 +346,12 @@ struct IRCDMessageMode : IRCDMessage
  **	  parv[0] = new nickname
  **	  parv[1] = hopcount
  */
-struct IRCDMessageNick : IRCDMessage
+struct IRCDMessageNick final
+	: IRCDMessage
 {
-	IRCDMessageNick(Module *creator) : IRCDMessage(creator, "NICK", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	IRCDMessageNick(Module *creator) : IRCDMessage(creator, "NICK", 2) { SetFlag(FLAG_SOFT_LIMIT); }
 
-	void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
+	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
 	{
 		if (params.size() == 10)
 		{
@@ -378,8 +363,8 @@ struct IRCDMessageNick : IRCDMessage
 			}
 
 			NickAlias *na = NULL;
-			time_t signon = params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0,
-				stamp = params[7].is_pos_number_only() ? convertTo<time_t>(params[7]) : 0;
+			auto signon = IRCD->ExtractTimestamp(params[2]);
+			auto stamp = IRCD->ExtractTimestamp(params[7]);
 			if (signon && signon == stamp)
 				na = NickAlias::Find(params[0]);
 
@@ -395,22 +380,24 @@ struct IRCDMessageNick : IRCDMessage
 	}
 };
 
-struct IRCDMessageServer : IRCDMessage
+struct IRCDMessageServer final
+	: IRCDMessage
 {
-	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(IRCDMESSAGE_REQUIRE_SERVER); }
+	IRCDMessageServer(Module *creator) : IRCDMessage(creator, "SERVER", 3) { SetFlag(FLAG_REQUIRE_SERVER); }
 
-	void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
+	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
 	{
-		unsigned int hops = Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0;
+		auto hops = Anope::Convert<unsigned>(params[1], 0);
 		new Server(source.GetServer() == NULL ? Me : source.GetServer(), params[0], hops, params[2]);
 	}
 };
 
-struct IRCDMessageSJoin : IRCDMessage
+struct IRCDMessageSJoin final
+	: IRCDMessage
 {
-	IRCDMessageSJoin(Module *creator) : IRCDMessage(creator, "SJOIN", 2) { SetFlag(IRCDMESSAGE_SOFT_LIMIT); }
+	IRCDMessageSJoin(Module *creator) : IRCDMessage(creator, "SJOIN", 2) { SetFlag(FLAG_SOFT_LIMIT); }
 
-	void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
+	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
 	{
 		Anope::string modes;
 		if (params.size() >= 4)
@@ -457,24 +444,26 @@ struct IRCDMessageSJoin : IRCDMessage
 			}
 		}
 
-		time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : Anope::CurTime;
+		auto ts = IRCD->ExtractTimestamp(params[0]);
 		Message::Join::SJoin(source, params[1], ts, modes, users);
 	}
 };
 
-struct IRCDMessageTopic : IRCDMessage
+struct IRCDMessageTopic final
+	: IRCDMessage
 {
 	IRCDMessageTopic(Module *creator) : IRCDMessage(creator, "TOPIC", 4) { }
 
-	void Run(MessageSource &source, const std::vector<Anope::string> &params) anope_override
+	void Run(MessageSource &source, const std::vector<Anope::string> &params, const Anope::map<Anope::string> &tags) override
 	{
 		Channel *c = Channel::Find(params[0]);
 		if (c)
-			c->ChangeTopicInternal(source.GetUser(), params[1], params[3], Anope::string(params[2]).is_pos_number_only() ? convertTo<time_t>(params[2]) : Anope::CurTime);
+			c->ChangeTopicInternal(source.GetUser(), params[1], params[3], IRCD->ExtractTimestamp(params[2]));
 	}
 };
 
-class ProtoBahamut : public Module
+class ProtoBahamut final
+	: public Module
 {
 	BahamutIRCdProto ircd_proto;
 
@@ -506,7 +495,7 @@ class ProtoBahamut : public Module
 	IRCDMessageSJoin message_sjoin;
 	IRCDMessageTopic message_topic;
 
-	void AddModes()
+	static void AddModes()
 	{
 		/* Add user modes */
 		ModeManager::AddUserMode(new UserModeOperOnly("SERV_ADMIN", 'A'));
@@ -544,7 +533,7 @@ class ProtoBahamut : public Module
 		ModeManager::AddChannelMode(new ChannelMode("REGISTEREDONLY", 'R'));
 	}
 
- public:
+public:
 	ProtoBahamut(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PROTOCOL | VENDOR),
 		ircd_proto(this),
 		message_away(this), message_capab(this), message_error(this), message_invite(this),
@@ -555,12 +544,10 @@ class ProtoBahamut : public Module
 		message_burst(this), message_mode(this, "MODE"), message_svsmode(this, "SVSMODE"),
 		message_nick(this), message_server(this), message_sjoin(this), message_topic(this)
 	{
-
 		this->AddModes();
-
 	}
 
-	void OnUserNickChange(User *u, const Anope::string &) anope_override
+	void OnUserNickChange(User *u, const Anope::string &) override
 	{
 		u->RemoveModeInternal(Me, ModeManager::FindUserModeByName("REGISTERED"));
 		IRCD->SendLogout(u);