Add the IRCv3 reply tag to messages sent as responses to a user.

2 files changed, 30 insertions, 1 deletions

diff --git a/src/command.cpp b/src/command.cpp
index 2ac6cb7d7..dc24dac0b 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -17,6 +17,11 @@
 #include "regchannel.h"
 #include "channels.h"
 
+void CommandReply::SendMessage(CommandSource& source, const Anope::string &msg)
+{
+	SendMessage(source.service, msg);
+}
+
 CommandSource::CommandSource(const Anope::string &n, User *user, NickCore *core, CommandReply *r, BotInfo *bi, const Anope::string &m)
 	: nick(n)
 	, u(user)
@@ -119,7 +124,7 @@ void CommandSource::Reply(const Anope::string &message)
 	sepstream sep(translated_message, '\n', true);
 	Anope::string tok;
 	while (sep.GetToken(tok))
-		this->reply->SendMessage(this->service, tok);
+		this->reply->SendMessage(*this, tok);
 }
 
 Command::Command(Module *o, const Anope::string &sname, size_t minparams, size_t maxparams) : Service(o, "Command", sname), max_params(maxparams), min_params(minparams), module(o)
diff --git a/src/users.cpp b/src/users.cpp
index 452d84706..84a5173a4 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -352,6 +352,30 @@ void User::SendMessage(BotInfo *source, const Anope::string &msg)
 	}
 }
 
+void User::SendMessage(CommandSource& source, const Anope::string &msg)
+{
+	Anope::map<Anope::string> tags;
+	if (!source.msgid.empty())
+		tags["+draft/reply"] = source.msgid;
+
+	const char *translated_message = Language::Translate(this, msg.c_str());
+
+	/* Send privmsg instead of notice if:
+	* - UsePrivmsg is enabled
+	* - The user is not registered and NSDefMsg is enabled
+	* - The user is registered and has set /ns set msg on
+	*/
+	bool send_privmsg = Config->UsePrivmsg && ((!this->nc && Config->DefPrivmsg) || (this->nc && this->nc->HasExt("MSG")));
+	sepstream sep(translated_message, '\n', true);
+	for (Anope::string tok; sep.GetToken(tok);)
+	{
+		if (send_privmsg)
+			IRCD->SendPrivmsgInternal(*source.service, this->GetUID(), tok, tags);
+		else
+			IRCD->SendNoticeInternal(*source.service, this->GetUID(), tok, tags);
+	}
+}
+
 void User::Identify(NickAlias *na)
 {
 	if (this->nick.equals_ci(na->nick))