pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-03 19:03:14 +02:00
Code Activity

Deduplicate requirename code in os_shutdown.

Browse Source
This commit is contained in:
Sadie Powell
2025-03-22 08:33:21 +00:00
parent 602ff60e21
commit 39bb5825ad
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/operserv/os_shutdown.cpp
+19 -22
View File
@@ -11,7 +11,22 @@
#include "module.h"
#define WRONG_NETWORK _("The network name you specified is incorrect. Did you mean to run %s on a different network?")
namespace
{
bool NetworkNameGiven(Command *cmd, CommandSource &source, const std::vector<Anope::string> &params)
{
if (!Config->GetModule(cmd->owner).Get<bool>("requirename"))
return true; // Not necesary.
if (params.empty())
cmd->OnSyntaxError(source, source.command);
else if (!params[0].equals_cs(Config->GetBlock("networkinfo").Get<Anope::string>("networkname")))
source.Reply(_("The network name you specified is incorrect. Did you mean to run %s on a different network?"), source.command.c_str());
else
return true; // Name was specified correctly
return false; // Network name was wrong or not specified.
}
}
class CommandOSQuit final
: public Command
@@ -26,14 +41,8 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (Config->GetModule(this->owner).Get<bool>("requirename"))
{
if (params.empty())
OnSyntaxError(source, source.command);
else if (!params[0].equals_cs(Config->GetBlock("networkinfo").Get<Anope::string>("networkname")))
source.Reply(WRONG_NETWORK, source.command.c_str());
if (!NetworkNameGiven(this, source, params))
return;
}
Log(LOG_ADMIN, source, this);
Anope::QuitReason = source.command + " command received from " + source.GetNick();
@@ -66,14 +75,8 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (Config->GetModule(this->owner).Get<bool>("requirename"))
{
if (params.empty())
OnSyntaxError(source, source.command);
else if (!params[0].equals_cs(Config->GetBlock("networkinfo").Get<Anope::string>("networkname")))
source.Reply(WRONG_NETWORK, source.command.c_str());
if (!NetworkNameGiven(this, source, params))
return;
}
Log(LOG_ADMIN, source, this);
Anope::QuitReason = source.command + " command received from " + source.GetNick();
@@ -104,14 +107,8 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (Config->GetModule(this->owner).Get<bool>("requirename"))
{
if (params.empty())
OnSyntaxError(source, source.command);
else if (!params[0].equals_cs(Config->GetBlock("networkinfo").Get<Anope::string>("networkname")))
source.Reply(WRONG_NETWORK, source.command.c_str());
if (!NetworkNameGiven(this, source, params))
return;
}
Log(LOG_ADMIN, source, this);
Anope::QuitReason = source.command + " command received from " + source.GetNick();