Rework SendModeInternal to be usable with Uplink::Send.

2 files changed, 31 insertions, 37 deletions

diff --git a/src/modes.cpp b/src/modes.cpp
index 870081860..6cf99f61e 100644
--- a/src/modes.cpp
+++ b/src/modes.cpp
@@ -330,27 +330,33 @@ static StackerInfo *GetInfo(List &l, Object *o)
  * @param info The stacker info for a channel or user
  * @return a list of strings
  */
-static std::list<Anope::string> BuildModeStrings(StackerInfo *info)
+static auto BuildModeStrings(StackerInfo *info)
 {
-	std::list<Anope::string> ret;
+	std::list<std::pair<Anope::string, std::vector<Anope::string>>> ret;
 	std::list<std::pair<Mode *, Anope::string> >::iterator it, it_end;
-	Anope::string buf = "+", parambuf;
+	Anope::string buf = "+";
+	std::vector<Anope::string> parambuf;
 	unsigned NModes = 0;
+	size_t paramlen = 0;
 
 	for (it = info->AddModes.begin(), it_end = info->AddModes.end(); it != it_end; ++it)
 	{
-		if (++NModes > IRCD->MaxModes || (buf.length() + parambuf.length() > IRCD->MaxLine - 100)) // Leave room for command, channel, etc
+		if (++NModes > IRCD->MaxModes || (buf.length() + paramlen > IRCD->MaxLine - 100)) // Leave room for command, channel, etc
 		{
-			ret.push_back(buf + parambuf);
+			ret.push_back({buf, parambuf});
 			buf = "+";
 			parambuf.clear();
+			paramlen = 0;
 			NModes = 1;
 		}
 
 		buf += it->first->mchar;
 
 		if (!it->second.empty())
-			parambuf += " " + it->second;
+		{
+			parambuf.push_back(it->second);
+			paramlen += it->second.length() + 1;
+		}
 	}
 
 	if (buf[buf.length() - 1] == '+')
@@ -359,25 +365,29 @@ static std::list<Anope::string> BuildModeStrings(StackerInfo *info)
 	buf += "-";
 	for (it = info->DelModes.begin(), it_end = info->DelModes.end(); it != it_end; ++it)
 	{
-		if (++NModes > IRCD->MaxModes || (buf.length() + parambuf.length() > IRCD->MaxLine - 100)) // Leave room for command, channel, etc
+		if (++NModes > IRCD->MaxModes || (buf.length() + paramlen > IRCD->MaxLine - 100)) // Leave room for command, channel, etc
 		{
-			ret.push_back(buf + parambuf);
+			ret.push_back({buf, parambuf});
 			buf = "-";
 			parambuf.clear();
+			paramlen = 0;
 			NModes = 1;
 		}
 
 		buf += it->first->mchar;
 
 		if (!it->second.empty())
-			parambuf += " " + it->second;
+		{
+			parambuf.push_back(it->second);
+			paramlen += it->second.length() + 1;
+		}
 	}
 
 	if (buf[buf.length() - 1] == '-')
 		buf.erase(buf.length() - 1);
 
 	if (!buf.empty())
-		ret.push_back(buf + parambuf);
+		ret.push_back({buf, parambuf});
 
 	return ret;
 }
@@ -632,7 +642,7 @@ void ModeManager::ProcessModes()
 		for (const auto &[u, s] : UserStackerObjects)
 		{
 			for (const auto &modestr : BuildModeStrings(s))
-				IRCD->SendMode(s->bi, u, "%s", modestr.c_str());
+				IRCD->SendModeInternal(s->bi, u, modestr.first, modestr.second);
 			delete s;
 		}
 		UserStackerObjects.clear();
@@ -643,7 +653,7 @@ void ModeManager::ProcessModes()
 		for (const auto &[c, s] : ChannelStackerObjects)
 		{
 			for (const auto &modestr : BuildModeStrings(s))
-				IRCD->SendMode(s->bi, c, "%s", modestr.c_str());
+				IRCD->SendModeInternal(s->bi, c, modestr.first, modestr.second);
 			delete s;
 		}
 		ChannelStackerObjects.clear();
@@ -658,7 +668,7 @@ static void StackerDel(std::map<T *, StackerInfo *> &map, T *obj)
 	{
 		StackerInfo *si = it->second;
 		for (const auto &modestr : BuildModeStrings(si))
-			IRCD->SendMode(si->bi, obj, "%s", modestr.c_str());
+			IRCD->SendModeInternal(si->bi, obj, modestr.first, modestr.second);
 
 		delete si;
 		map.erase(it);
diff --git a/src/protocol.cpp b/src/protocol.cpp
index 41df1dadc..cfa03d3d8 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -95,14 +95,18 @@ void IRCDProto::SendSVSKillInternal(const MessageSource &source, User *user, con
 	Uplink::Send(source, "KILL", user->GetUID(), buf);
 }
 
-void IRCDProto::SendModeInternal(const MessageSource &source, const Channel *dest, const Anope::string &buf)
+void IRCDProto::SendModeInternal(const MessageSource &source, Channel *chan, const Anope::string &modes, const std::vector<Anope::string> &values)
 {
-	UplinkSocket::Message(source) << "MODE " << dest->name << " " << buf;
+	auto params = values;
+	params.insert(params.begin(), { chan->name, modes });
+	Uplink::SendInternal({}, source, "MODE", params);
 }
 
-void IRCDProto::SendModeInternal(const MessageSource &source, User *dest, const Anope::string &buf)
+void IRCDProto::SendModeInternal(const MessageSource &source, User *dest, const Anope::string &modes, const std::vector<Anope::string> &values)
 {
-	UplinkSocket::Message(source) << "MODE " << dest->GetUID() << " " << buf;
+	auto params = values;
+	params.insert(params.begin(), { dest->GetUID(), modes });
+	Uplink::SendInternal({}, source, "MODE", params);
 }
 
 void IRCDProto::SendKickInternal(const MessageSource &source, const Channel *c, User *u, const Anope::string &r)
@@ -181,26 +185,6 @@ void IRCDProto::SendSVSKill(const MessageSource &source, User *user, const char
 	SendSVSKillInternal(source, user, buf);
 }
 
-void IRCDProto::SendMode(const MessageSource &source, const Channel *dest, const char *fmt, ...)
-{
-	va_list args;
-	char buf[BUFSIZE] = "";
-	va_start(args, fmt);
-	vsnprintf(buf, BUFSIZE - 1, fmt, args);
-	va_end(args);
-	SendModeInternal(source, dest, buf);
-}
-
-void IRCDProto::SendMode(const MessageSource &source, User *u, const char *fmt, ...)
-{
-	va_list args;
-	char buf[BUFSIZE] = "";
-	va_start(args, fmt);
-	vsnprintf(buf, BUFSIZE - 1, fmt, args);
-	va_end(args);
-	SendModeInternal(source, u, buf);
-}
-
 void IRCDProto::SendKick(const MessageSource &source, const Channel *chan, User *user, const char *fmt, ...)
 {
 	if (!chan || !user)