From: Peter Powell <petpow@saberuk.com>
Date: Sun, 17 Nov 2019 22:37:24 +0000 (+0000)
Subject: Deprecate Send{Channel,User}Notice; use SendMessage instead.
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=2ec7654267f8ad127653839ba9aaf369705e3026;p=user%2Fhenk%2Fcode%2Finspircd.git

Deprecate Send{Channel,User}Notice; use SendMessage instead.
---

diff --git a/include/protocol.h b/include/protocol.h
index f98f6b37d..c95ea1706 100644
--- a/include/protocol.h
+++ b/include/protocol.h
@@ -122,7 +122,7 @@ class CoreExport ProtocolInterface
 	 * @param status The status character (e.g. %) required to receive.
 	 * @param text The message to send.
 	 */
-	void SendChannelNotice(Channel* target, char status, const std::string &text)
+	DEPRECATED_METHOD(void SendChannelNotice(Channel* target, char status, const std::string& text))
 	{
 		SendMessage(target, status, text, MSG_NOTICE);
 	}
@@ -131,7 +131,7 @@ class CoreExport ProtocolInterface
 	 * @param target The user to message.
 	 * @param text The message to send.
 	 */
-	void SendUserNotice(User* target, const std::string &text)
+	DEPRECATED_METHOD(void SendUserNotice(User* target, const std::string& text))
 	{
 		SendMessage(target, text, MSG_NOTICE);
 	}
diff --git a/src/users.cpp b/src/users.cpp
index bca1c6a7c..6c58f0617 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -853,7 +853,7 @@ void User::WriteNumeric(const Numeric::Numeric& numeric)
 
 void User::WriteRemoteNotice(const std::string& text)
 {
-	ServerInstance->PI->SendUserNotice(this, text);
+	ServerInstance->PI->SendMessage(this, text, MSG_NOTICE);
 }
 
 void LocalUser::WriteRemoteNotice(const std::string& text)