X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=8cbf8a8daf8543a7ffc4b9366fc1d2c249a99e9d;hb=5fbb5a0b2c5c08f76f99bd03b51bce2164feade3;hp=fa346a32968f2164a93aed14c447ef9ba25d7e42;hpb=3e0ac4917242a6d62452e7c70aea25dc7bc1e39d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index fa346a329..8cbf8a8da 100644
--- a/include/users.h
+++ b/include/users.h
@@ -519,9 +519,114 @@ class CoreExport User : public Extensible
 	 */
 	void WriteNotice(const std::string& text) { this->WriteCommand("NOTICE", ":" + text); }
 
-	void WriteNumeric(unsigned int numeric, const char* text, ...) CUSTOM_PRINTF(3, 4);
+	/** Send a NOTICE message from the local server to the user.
+	 * @param text Text to send
+	 */
+	virtual void WriteRemoteNotice(const std::string& text);
+
+	virtual void WriteRemoteNumeric(const Numeric::Numeric& numeric);
+
+	template <typename T1>
+	void WriteRemoteNumeric(unsigned int numeric, T1 p1)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		WriteRemoteNumeric(n);
+	}
+
+	template <typename T1, typename T2>
+	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		WriteRemoteNumeric(n);
+	}
+
+	template <typename T1, typename T2, typename T3>
+	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		n.push(p3);
+		WriteRemoteNumeric(n);
+	}
+
+	template <typename T1, typename T2, typename T3, typename T4>
+	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		n.push(p3);
+		n.push(p4);
+		WriteRemoteNumeric(n);
+	}
+
+	template <typename T1, typename T2, typename T3, typename T4, typename T5>
+	void WriteRemoteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		n.push(p3);
+		n.push(p4);
+		n.push(p5);
+		WriteRemoteNumeric(n);
+	}
+
+	void WriteNumeric(const Numeric::Numeric& numeric);
 
-	void WriteNumeric(unsigned int numeric, const std::string &text);
+	template <typename T1>
+	void WriteNumeric(unsigned int numeric, T1 p1)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		WriteNumeric(n);
+	}
+
+	template <typename T1, typename T2>
+	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		WriteNumeric(n);
+	}
+
+	template <typename T1, typename T2, typename T3>
+	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		n.push(p3);
+		WriteNumeric(n);
+	}
+
+	template <typename T1, typename T2, typename T3, typename T4>
+	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		n.push(p3);
+		n.push(p4);
+		WriteNumeric(n);
+	}
+
+	template <typename T1, typename T2, typename T3, typename T4, typename T5>
+	void WriteNumeric(unsigned int numeric, T1 p1, T2 p2, T3 p3, T4 p4, T5 p5)
+	{
+		Numeric::Numeric n(numeric);
+		n.push(p1);
+		n.push(p2);
+		n.push(p3);
+		n.push(p4);
+		n.push(p5);
+		WriteNumeric(n);
+	}
 
 	/** Write text to this user, appending CR/LF and prepending :nick!user\@host of the user provided in the first parameter.
 	 * @param user The user to prepend the :nick!user\@host of
@@ -558,12 +663,6 @@ class CoreExport User : public Extensible
 	 */
 	void ForEachNeighbor(ForEachNeighborHandler& handler, bool include_self = true);
 
-	/** Dump text to a user target, splitting it appropriately to fit
-	 * @param linePrefix text to prefix each complete line with
-	 * @param textStream the text to send to the user
-	 */
-	void SendText(const std::string& linePrefix, std::stringstream& textStream);
-
 	/** Write to the user, routing the line if the user is remote.
 	 */
 	virtual void SendText(const std::string& line) = 0;
@@ -747,6 +846,12 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
 	void Write(const std::string& text);
 	void Write(const char*, ...) CUSTOM_PRINTF(2, 3);
 
+	/** Send a NOTICE message from the local server to the user.
+	 * The message will be sent even if the user is connected to a remote server.
+	 * @param text Text to send
+	 */
+	void WriteRemoteNotice(const std::string& text) CXX11_OVERRIDE;
+
 	/** Returns true or false for if a user can execute a privilaged oper command.
 	 * This is done by looking up their oper type from User::oper, then referencing
 	 * this to their oper classes and checking the commands they can execute.