From 435ce511962e83a0581accd572dfa4e2c5722ab4 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 22 Oct 2024 14:14:40 +0100 Subject: Move nickserv/set/message to a new module, kill options:useprivmsg. --- modules/nickserv/ns_set.cpp | 116 +----------------------------- modules/nickserv/ns_set_message.cpp | 137 ++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 114 deletions(-) create mode 100644 modules/nickserv/ns_set_message.cpp (limited to 'modules') diff --git a/modules/nickserv/ns_set.cpp b/modules/nickserv/ns_set.cpp index b4dbe0a44..25c4e5a0d 100644 --- a/modules/nickserv/ns_set.cpp +++ b/modules/nickserv/ns_set.cpp @@ -892,112 +892,6 @@ public: } }; -class CommandNSSetMessage - : public Command -{ -public: - CommandNSSetMessage(Module *creator, const Anope::string &sname = "nickserv/set/message", size_t min = 1) : Command(creator, sname, min, min + 1) - { - this->SetDesc(_("Change the communication method of services")); - this->SetSyntax("{ON | OFF}"); - } - - void Run(CommandSource &source, const Anope::string &user, const Anope::string ¶m) - { - if (Anope::ReadOnly) - { - source.Reply(READ_ONLY_MODE); - return; - } - - const NickAlias *na = NickAlias::Find(user); - if (!na) - { - source.Reply(NICK_X_NOT_REGISTERED, user.c_str()); - return; - } - NickCore *nc = na->nc; - - if (!Config->GetBlock("options")->Get("useprivmsg")) - { - source.Reply(_("You cannot %s on this network."), source.command.c_str()); - return; - } - - EventReturn MOD_RESULT; - FOREACH_RESULT(OnSetNickOption, MOD_RESULT, (source, this, nc, param)); - if (MOD_RESULT == EVENT_STOP) - return; - - if (param.equals_ci("ON")) - { - Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to enable " << source.command << " for " << nc->display; - nc->Extend("MSG"); - source.Reply(_("Services will now reply to \002%s\002 with \002messages\002."), nc->display.c_str()); - } - else if (param.equals_ci("OFF")) - { - Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to disable " << source.command << " for " << nc->display; - nc->Shrink("MSG"); - source.Reply(_("Services will now reply to \002%s\002 with \002notices\002."), nc->display.c_str()); - } - else - this->OnSyntaxError(source, "MSG"); - } - - void Execute(CommandSource &source, const std::vector ¶ms) override - { - this->Run(source, source.nc->display, params[0]); - } - - bool OnHelp(CommandSource &source, const Anope::string &) override - { - Anope::string cmd = source.command; - size_t i = cmd.find_last_of(' '); - if (i != Anope::string::npos) - cmd = cmd.substr(i + 1); - - this->SendSyntax(source); - source.Reply(" "); - source.Reply(_("Allows you to choose the way services are communicating with\n" - "you. With \002%s\002 set, services will use messages, else they'll\n" - "use notices."), cmd.upper().c_str()); - return true; - } - - void OnServHelp(CommandSource &source) override - { - if (Config->GetBlock("options")->Get("useprivmsg")) - Command::OnServHelp(source); - } -}; - -class CommandNSSASetMessage final - : public CommandNSSetMessage -{ -public: - CommandNSSASetMessage(Module *creator) : CommandNSSetMessage(creator, "nickserv/saset/message", 2) - { - this->ClearSyntax(); - this->SetSyntax(_("\037nickname\037 {ON | OFF}")); - } - - bool OnHelp(CommandSource &source, const Anope::string &) override - { - this->SendSyntax(source); - source.Reply(" "); - source.Reply(_("Allows you to choose the way services are communicating with\n" - "the given user. With \002MSG\002 set, services will use messages,\n" - "else they'll use notices.")); - return true; - } - - void Execute(CommandSource &source, const std::vector ¶ms) override - { - this->Run(source, params[0], params[1]); - } -}; - class CommandNSSASetNoexpire final : public Command { @@ -1075,16 +969,13 @@ class NSSet final CommandNSSetKill commandnssetkill; CommandNSSASetKill commandnssasetkill; - CommandNSSetMessage commandnssetmessage; - CommandNSSASetMessage commandnssasetmessage; - CommandNSSetPassword commandnssetpassword; CommandNSSASetPassword commandnssasetpassword; CommandNSSASetNoexpire commandnssasetnoexpire; SerializableExtensibleItem autoop, neverop, killprotect, kill_quick, kill_immed, - message, noexpire; + noexpire; struct KeepModes final : SerializableExtensibleItem @@ -1145,13 +1036,12 @@ public: commandnssetemail(this), commandnssasetemail(this), commandnssetkeepmodes(this), commandnssasetkeepmodes(this), commandnssetkill(this), commandnssasetkill(this), - commandnssetmessage(this), commandnssasetmessage(this), commandnssetpassword(this), commandnssasetpassword(this), commandnssasetnoexpire(this), autoop(this, "AUTOOP"), neverop(this, "NEVEROP"), killprotect(this, "KILLPROTECT"), kill_quick(this, "KILL_QUICK"), - kill_immed(this, "KILL_IMMED"), message(this, "MSG"), + kill_immed(this, "KILL_IMMED"), noexpire(this, "NS_NO_EXPIRE"), keep_modes(this, "NS_KEEP_MODES"), ns_set_email(this, "ns_set_email") @@ -1208,8 +1098,6 @@ public: info.AddOption(_("Quick protection")); else if (killprotect.HasExt(na->nc)) info.AddOption(_("Protection")); - if (message.HasExt(na->nc)) - info.AddOption(_("Message mode")); if (autoop.HasExt(na->nc)) info.AddOption(_("Auto-op")); if (neverop.HasExt(na->nc)) diff --git a/modules/nickserv/ns_set_message.cpp b/modules/nickserv/ns_set_message.cpp new file mode 100644 index 000000000..04bb331d2 --- /dev/null +++ b/modules/nickserv/ns_set_message.cpp @@ -0,0 +1,137 @@ +/* NickServ core functions + * + * (C) 2003-2024 Anope Team + * Contact us at team@anope.org + * + * Please read COPYING and README for further details. + * + * Based on the original code of Epona by Lara. + * Based on the original code of Services by Andy Church. + */ + +#include "module.h" + +class CommandNSSetMessage + : public Command +{ +public: + CommandNSSetMessage(Module *creator, const Anope::string &sname = "nickserv/set/message", size_t min = 1) + : Command(creator, sname, min, min + 1) + { + this->SetDesc(_("Change the communication method of services")); + this->SetSyntax("{ON | OFF}"); + } + + void Run(CommandSource &source, const Anope::string &user, const Anope::string ¶m) + { + if (Anope::ReadOnly) + { + source.Reply(READ_ONLY_MODE); + return; + } + + const NickAlias *na = NickAlias::Find(user); + if (!na) + { + source.Reply(NICK_X_NOT_REGISTERED, user.c_str()); + return; + } + NickCore *nc = na->nc; + + + EventReturn MOD_RESULT; + FOREACH_RESULT(OnSetNickOption, MOD_RESULT, (source, this, nc, param)); + if (MOD_RESULT == EVENT_STOP) + return; + + if (param.equals_ci("ON")) + { + Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to enable " << source.command << " for " << nc->display; + nc->Extend("MSG"); + source.Reply(_("Services will now reply to \002%s\002 with \002messages\002."), nc->display.c_str()); + } + else if (param.equals_ci("OFF")) + { + Log(nc == source.GetAccount() ? LOG_COMMAND : LOG_ADMIN, source, this) << "to disable " << source.command << " for " << nc->display; + nc->Shrink("MSG"); + source.Reply(_("Services will now reply to \002%s\002 with \002notices\002."), nc->display.c_str()); + } + else + this->OnSyntaxError(source, "MSG"); + } + + void Execute(CommandSource &source, const std::vector ¶ms) override + { + this->Run(source, source.nc->display, params[0]); + } + + bool OnHelp(CommandSource &source, const Anope::string &) override + { + Anope::string cmd = source.command; + size_t i = cmd.find_last_of(' '); + if (i != Anope::string::npos) + cmd = cmd.substr(i + 1); + + this->SendSyntax(source); + source.Reply(" "); + source.Reply(_("Allows you to choose the way services are communicating with\n" + "you. With \002%s\002 set, services will use messages, else they'll\n" + "use notices."), cmd.upper().c_str()); + return true; + } +}; + +class CommandNSSASetMessage final + : public CommandNSSetMessage +{ +public: + CommandNSSASetMessage(Module *creator) : CommandNSSetMessage(creator, "nickserv/saset/message", 2) + { + this->ClearSyntax(); + this->SetSyntax(_("\037nickname\037 {ON | OFF}")); + } + + bool OnHelp(CommandSource &source, const Anope::string &) override + { + this->SendSyntax(source); + source.Reply(" "); + source.Reply(_("Allows you to choose the way services are communicating with\n" + "the given user. With \002MSG\002 set, services will use messages,\n" + "else they'll use notices.")); + return true; + } + + void Execute(CommandSource &source, const std::vector ¶ms) override + { + this->Run(source, params[0], params[1]); + } +}; + + +class NSSetMessage final + : public Module +{ +private: + CommandNSSetMessage commandnssetmessage; + CommandNSSASetMessage commandnssasetmessage; + SerializableExtensibleItem message; + +public: + NSSetMessage(const Anope::string &modname, const Anope::string &creator) + : Module(modname, creator, VENDOR) + , commandnssetmessage(this) + , commandnssasetmessage(this) + , message(this, "MSG") + { + } + + void OnNickInfo(CommandSource &source, NickAlias *na, InfoFormatter &info, bool show_hidden) override + { + if (!show_hidden) + return; + if (message.HasExt(na->nc)) + info.AddOption(_("Message mode")); + } +}; + +MODULE_INIT(NSSetMessage) -- cgit