From 99bcc6d3b71d51391d1f7fc2be99734028ffa413 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 16 Mar 2025 20:14:39 +0000 Subject: Improve the error reporting in os_shutdown. --- modules/operserv/os_shutdown.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'modules') 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; } -- cgit