From 8fcb8ee6d6542b533e132bc8958a895553ee8371 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 11 Mar 2021 05:37:15 +0000 Subject: Add support for sending a standard reply with no command name. --- include/modules/ircv3_replies.h | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h index f3c5c451a..f9b58fdf6 100644 --- a/include/modules/ircv3_replies.h +++ b/include/modules/ircv3_replies.h @@ -91,7 +91,10 @@ class IRCv3::Replies::Reply void Send(LocalUser* user, Command* command, const std::string& code, const std::string& description) { ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName()); - msg.PushParamRef(command->name); + if (command) + msg.PushParamRef(command->name); + else + msg.PushParam("*"); msg.PushParam(code); msg.PushParam(description); SendInternal(user, msg); @@ -101,7 +104,10 @@ class IRCv3::Replies::Reply void Send(LocalUser* user, Command* command, const std::string& code, const T1& p1, const std::string& description) { ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName()); - msg.PushParamRef(command->name); + if (command) + msg.PushParamRef(command->name); + else + msg.PushParam("*"); msg.PushParam(code); msg.PushParam(ConvToStr(p1)); msg.PushParam(description); @@ -113,7 +119,10 @@ class IRCv3::Replies::Reply const std::string& description) { ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName()); - msg.PushParamRef(command->name); + if (command) + msg.PushParamRef(command->name); + else + msg.PushParam("*"); msg.PushParam(code); msg.PushParam(ConvToStr(p1)); msg.PushParam(ConvToStr(p2)); @@ -126,7 +135,10 @@ class IRCv3::Replies::Reply const T3& p3, const std::string& description) { ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName()); - msg.PushParamRef(command->name); + if (command) + msg.PushParamRef(command->name); + else + msg.PushParam("*"); msg.PushParam(code); msg.PushParam(ConvToStr(p1)); msg.PushParam(ConvToStr(p2)); @@ -140,7 +152,10 @@ class IRCv3::Replies::Reply const T3& p3, const T4& p4, const std::string& description) { ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName()); - msg.PushParamRef(command->name); + if (command) + msg.PushParamRef(command->name); + else + msg.PushParam("*"); msg.PushParam(code); msg.PushParam(ConvToStr(p1)); msg.PushParam(ConvToStr(p2)); -- cgit v1.2.3