Remove send_cmd and replace it with a stringstream

3 files changed, 22 insertions, 7 deletions

diff --git a/include/extern.h b/include/extern.h
index 9a1583ec6..17802d91a 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -117,6 +117,21 @@ class UplinkSocket : public ConnectionSocket, public BufferedSocket
 	bool Read(const Anope::string &);
 	void OnConnect();
 	void OnError(const Anope::string &);
+	
+	class CoreExport Message
+	{
+		Anope::string source;
+		std::stringstream buffer;
+	 public:
+	 	Message();
+	 	Message(const Anope::string &);
+	 	~Message();
+		template<typename T> Message &operator<<(const T &val)
+		{
+			this->buffer << val;
+			return *this;
+		}
+	};
 };
 E UplinkSocket *UplinkSock;
 E int CurrentUplink;
@@ -200,12 +215,6 @@ E bool is_on_access(const User *u, const NickCore *nc);
 
 E void process(const Anope::string &buf);
 
-/**** send.c ****/
-
-E void send_cmd(const Anope::string &source, const char *fmt, ...) FORMAT(printf, 2, 3);
-
-E void notice_server(const Anope::string &source, const Server *s, const char *fmt, ...) FORMAT(printf, 3, 4);
-
 /**** sockets.cpp ****/
 
 E int32_t TotalRead;
diff --git a/include/servers.h b/include/servers.h
index f23f20fc5..f63c747e3 100644
--- a/include/servers.h
+++ b/include/servers.h
@@ -152,6 +152,12 @@ class CoreExport Server : public Flags<ServerFlag>
 	 */
 	bool IsULined() const;
 
+	/** Send a message to alll users on this server
+	 * @param source The source of the message
+	 * @param message The message
+	 */
+	void Notice(BotInfo *source, const Anope::string &message);
+
 	/** Find a server
 	 * @param name The name or SID/numeric
 	 * @param s The server list to search for this server on, defaults to our Uplink
diff --git a/include/services.h b/include/services.h
index 06596db5d..1da51e296 100644
--- a/include/services.h
+++ b/include/services.h
@@ -792,7 +792,7 @@ class CoreExport IRCDProto
 	virtual void SendPart(const BotInfo *bi, const Channel *chan, const char *fmt, ...);
 	virtual void SendGlobops(const BotInfo *source, const char *fmt, ...);
 	virtual void SendSQLine(User *, const XLine *x) { }
-	virtual void SendSquit(const Anope::string &servname, const Anope::string &message);
+	virtual void SendSquit(Server *, const Anope::string &message);
 	virtual void SendSVSO(const Anope::string &, const Anope::string &, const Anope::string &) { }
 	virtual void SendChangeBotNick(const BotInfo *bi, const Anope::string &newnick);
 	virtual void SendForceNickChange(const User *u, const Anope::string &newnick, time_t when);