summaryrefslogtreecommitdiff
path: root/src/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 /src/modules
parent029ff235e184acc8194e76ef535e437cb6c9f614 (diff)
Hide the server name/desc better when <options:hideserver> is set.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/m_ircv3_batch.cpp2
-rw-r--r--src/modules/m_permchannels.cpp2
-rw-r--r--src/modules/m_spanningtree/main.cpp2
-rw-r--r--src/modules/m_sslinfo.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/m_ircv3_batch.cpp b/src/modules/m_ircv3_batch.cpp
index bbb78557d..197ee3ebe 100644
--- a/src/modules/m_ircv3_batch.cpp
+++ b/src/modules/m_ircv3_batch.cpp
@@ -26,7 +26,7 @@ class BatchMessage : public ClientProtocol::Message
{
public:
BatchMessage(const IRCv3::Batch::Batch& batch, bool start)
- : ClientProtocol::Message("BATCH", ServerInstance->Config->ServerName)
+ : ClientProtocol::Message("BATCH", ServerInstance->Config->GetServerName())
{
char c = (start ? '+' : '-');
PushParam(std::string(1, c) + batch.GetRefTagStr());
diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 4bc9c2fad..a408ff142 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -228,7 +228,7 @@ public:
topicset = ServerInstance->Time();
std::string topicsetby = tag->getString("topicsetby");
if (topicsetby.empty())
- topicsetby = ServerInstance->Config->ServerName;
+ topicsetby = ServerInstance->Config->GetServerName();
c->SetTopic(ServerInstance->FakeClient, topic, topicset, &topicsetby);
}
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 1fd17c28a..01387c753 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -144,7 +144,7 @@ void ModuleSpanningTree::ShowLinks(TreeServer* Current, User* user, int hops)
return;
user->WriteNumeric(RPL_LINKS, Current->GetName(),
- (((Utils->FlatLinks) && (!user->IsOper())) ? ServerInstance->Config->ServerName : Parent),
+ (((Utils->FlatLinks) && (!user->IsOper())) ? ServerInstance->Config->GetServerName() : Parent),
InspIRCd::Format("%d %s", (((Utils->FlatLinks) && (!user->IsOper())) ? 0 : hops), Current->GetDesc().c_str()));
}
diff --git a/src/modules/m_sslinfo.cpp b/src/modules/m_sslinfo.cpp
index 0054e3ed7..bbbc9ba64 100644
--- a/src/modules/m_sslinfo.cpp
+++ b/src/modules/m_sslinfo.cpp
@@ -294,7 +294,7 @@ class ModuleSSLInfo
std::string text = "*** You are connected to ";
if (!ssliohook->GetServerName(text))
- text.append(ServerInstance->Config->ServerName);
+ text.append(ServerInstance->Config->GetServerName());
text.append(" using TLS (SSL) cipher '");
ssliohook->GetCiphersuite(text);
text.push_back('\'');