From 99bcc6d3b71d51391d1f7fc2be99734028ffa413 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 16 Mar 2025 20:14:39 +0000 Subject: [PATCH] Improve the error reporting in os_shutdown. --- language/anope.en_US.po | 5 ++++- modules/operserv/os_shutdown.cpp | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 647f09e71..72ba7a07c 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-08 13:33+0000\n" +"POT-Creation-Date: 2025-03-16 20:14+0000\n" "PO-Revision-Date: 2025-03-08 13:33+0000\n" "Last-Translator: Sadie Powell \n" "Language-Team: English\n" @@ -6144,6 +6144,9 @@ msgstr "" msgid "The mode lock list of %s is full." msgstr "" +msgid "The network name you specified is incorrect." +msgstr "" + #, c-format msgid "The new display MUST be a nickname of the nickname group %s." msgstr "" diff --git a/modules/operserv/os_shutdown.cpp b/modules/operserv/os_shutdown.cpp index 37dc15747..75288c242 100644 --- a/modules/operserv/os_shutdown.cpp +++ b/modules/operserv/os_shutdown.cpp @@ -11,6 +11,8 @@ #include "module.h" +#define WRONG_NETWORK _("The network name you specified is incorrect. Did you mean to run %s on a different network?") + class CommandOSQuit final : public Command { @@ -28,7 +30,10 @@ public: const auto networkname = Config->GetBlock("networkinfo").Get("networkname"); if (requirename && (params.empty() || !params[0].equals_cs(networkname))) { - OnSyntaxError(source, source.command); + if (!params.empty()) + source.Reply(WRONG_NETWORK, source.command.c_str()); + else + OnSyntaxError(source, source.command); return; } @@ -67,7 +72,10 @@ public: const auto networkname = Config->GetBlock("networkinfo").Get("networkname"); if (requirename && (params.empty() || !params[0].equals_cs(networkname))) { - OnSyntaxError(source, source.command); + if (!params.empty()) + source.Reply(WRONG_NETWORK, source.command.c_str()); + else + OnSyntaxError(source, source.command); return; } @@ -104,7 +112,10 @@ public: const auto networkname = Config->GetBlock("networkinfo").Get("networkname"); if (requirename && (params.empty() || !params[0].equals_cs(networkname))) { - OnSyntaxError(source, source.command); + if (!params.empty()) + source.Reply(WRONG_NETWORK, source.command.c_str()); + else + OnSyntaxError(source, source.command); return; }