X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=b97c62d4aa91a2fea09f8befd3426951a417818d;hb=7770cd985405c7630e9149fc08c314ec824a9c75;hp=5e7df74ea88293960a5b05a92d02ad493370423e;hpb=761e6d75ba37b984998952940ed681e79e456142;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index 5e7df74ea..b97c62d4a 100644
--- a/include/users.h
+++ b/include/users.h
@@ -519,7 +519,12 @@ class CoreExport User : public Extensible
 	 */
 	void WriteNotice(const std::string& text) { this->WriteCommand("NOTICE", ":" + text); }
 
-	void WriteRemoteNumeric(const Numeric::Numeric& numeric);
+	/** 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)
@@ -658,20 +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;
-
-	/** Write to the user, routing the line if the user is remote.
-	 */
-	void SendText(const char* text, ...) CUSTOM_PRINTF(2, 3);
-
 	/** Return true if the user shares at least one channel with another user
 	 * @param other The other user to compare the channel list against
 	 * @return True if the given user shares at least one channel with this user
@@ -843,10 +834,15 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
 
 	void SetClientIP(const irc::sockets::sockaddrs& sa, bool recheck_eline = true);
 
-	void SendText(const std::string& line);
 	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.
@@ -875,13 +871,12 @@ class CoreExport LocalUser : public User, public insp::intrusive_list_node<Local
 	bool HasModePermission(unsigned char mode, ModeType type);
 };
 
-class CoreExport RemoteUser : public User
+class RemoteUser : public User
 {
  public:
 	RemoteUser(const std::string& uid, Server* srv) : User(uid, srv, USERTYPE_REMOTE)
 	{
 	}
-	virtual void SendText(const std::string& line);
 };
 
 class CoreExport FakeUser : public User
@@ -899,7 +894,6 @@ class CoreExport FakeUser : public User
 	}
 
 	virtual CullResult cull();
-	virtual void SendText(const std::string& line);
 	virtual const std::string& GetFullHost();
 	virtual const std::string& GetFullRealHost();
 };