summaryrefslogtreecommitdiff
path: root/include/modules
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2020-12-20 03:04:21 +0000
committerSadie Powell <sadie@witchery.services>2020-12-20 03:05:29 +0000
commit6cfabb0064cab52bbbab59974e53dc0fa1954da7 (patch)
treeaa755e92103730ba6428332b4094578cde91cc67 /include/modules
parent029ff235e184acc8194e76ef535e437cb6c9f614 (diff)
Hide the server name/desc better when <options:hideserver> is set.
Diffstat (limited to 'include/modules')
-rw-r--r--include/modules/cap.h2
-rw-r--r--include/modules/ircv3_replies.h12
2 files changed, 7 insertions, 7 deletions
diff --git a/include/modules/cap.h b/include/modules/cap.h
index e14bcc422..9dacdc200 100644
--- a/include/modules/cap.h
+++ b/include/modules/cap.h
@@ -320,7 +320,7 @@ namespace Cap
{
public:
MessageBase(const std::string& subcmd)
- : ClientProtocol::Message("CAP", ServerInstance->Config->ServerName)
+ : ClientProtocol::Message("CAP", ServerInstance->Config->GetServerName())
{
PushParamPlaceholder();
PushParam(subcmd);
diff --git a/include/modules/ircv3_replies.h b/include/modules/ircv3_replies.h
index 4666f002a..f3c5c451a 100644
--- a/include/modules/ircv3_replies.h
+++ b/include/modules/ircv3_replies.h
@@ -90,7 +90,7 @@ 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->ServerName);
+ ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName());
msg.PushParamRef(command->name);
msg.PushParam(code);
msg.PushParam(description);
@@ -100,7 +100,7 @@ class IRCv3::Replies::Reply
template<typename T1>
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->ServerName);
+ ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName());
msg.PushParamRef(command->name);
msg.PushParam(code);
msg.PushParam(ConvToStr(p1));
@@ -112,7 +112,7 @@ class IRCv3::Replies::Reply
void Send(LocalUser* user, Command* command, const std::string& code, const T1& p1, const T2& p2,
const std::string& description)
{
- ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->ServerName);
+ ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName());
msg.PushParamRef(command->name);
msg.PushParam(code);
msg.PushParam(ConvToStr(p1));
@@ -125,7 +125,7 @@ class IRCv3::Replies::Reply
void Send(LocalUser* user, Command* command, const std::string& code, const T1& p1, const T2& p2,
const T3& p3, const std::string& description)
{
- ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->ServerName);
+ ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName());
msg.PushParamRef(command->name);
msg.PushParam(code);
msg.PushParam(ConvToStr(p1));
@@ -139,7 +139,7 @@ class IRCv3::Replies::Reply
void Send(LocalUser* user, Command* command, const std::string& code, const T1& p1, const T2& p2,
const T3& p3, const T4& p4, const std::string& description)
{
- ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->ServerName);
+ ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName());
msg.PushParamRef(command->name);
msg.PushParam(code);
msg.PushParam(ConvToStr(p1));
@@ -154,7 +154,7 @@ class IRCv3::Replies::Reply
void Send(LocalUser* user, Command* command, const std::string& code, const T1& p1, const T2& p2,
const T3& p3, const T4& p4, const T5& p5, const std::string& description)
{
- ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->ServerName);
+ ClientProtocol::Message msg(cmd.c_str(), ServerInstance->Config->GetServerName());
if (command)
msg.PushParamRef(command->name);
else