diff options
| author |  Sadie Powell | 2022-04-05 23:37:33 +0100 |
|---|---|---|
| committer | Sadie Powell | 2022-04-05 23:37:33 +0100 |
| commit | 72372136c46e1863ba09140f1d79e2e53270b86b (patch) | |
| tree | 05468ef0c90e6caa9eeb4ce9b74fd88f77c901be /src/modules/m_svshold.cpp | |
| parent | Release v4.0.0 alpha 9. (diff) | |
| parent | Use consistent xline messages locally (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_svshold.cpp')
| -rw-r--r-- | src/modules/m_svshold.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 3a6fe8c0e..4fcdc0a37 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -64,10 +64,7 @@ public: void DisplayExpiry() override { if (!silent) - { - ServerInstance->SNO.WriteToSnoMask('x', "Removing expired SVSHOLD %s (set by %s %s ago): %s", - nickname.c_str(), source.c_str(), InspIRCd::DurationString(ServerInstance->Time() - set_time).c_str(), reason.c_str()); - } + XLine::DisplayExpiry(); } const std::string& Displayable() override @@ -150,11 +147,11 @@ public: if (!duration) { - ServerInstance->SNO.WriteToSnoMask('x', "%s added permanent SVSHOLD for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); + ServerInstance->SNO.WriteToSnoMask('x', "%s added a permanent SVSHOLD on %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); } else { - ServerInstance->SNO.WriteToSnoMask('x', "%s added timed SVSHOLD for %s, expires in %s (on %s): %s", + ServerInstance->SNO.WriteToSnoMask('x', "%s added a timed SVSHOLD on %s, expires in %s (on %s): %s", user->nick.c_str(), parameters[0].c_str(), InspIRCd::DurationString(duration).c_str(), InspIRCd::TimeString(ServerInstance->Time() + duration).c_str(), parameters[2].c_str()); } |