diff options
| -rw-r--r-- | data/commands.example.conf | 1 | ||||
| -rw-r--r-- | data/example.conf | 2 | ||||
| -rw-r--r-- | modules/core/os_mode.cpp | 84 |
3 files changed, 54 insertions, 33 deletions
diff --git a/data/commands.example.conf b/data/commands.example.conf index ff7cbb581..ff487aa2d 100644 --- a/data/commands.example.conf +++ b/data/commands.example.conf @@ -295,6 +295,7 @@ module { name = "os_login" } command { service = "OperServ"; name = "LOGIN"; command = "operserv/login"; } module { name = "os_mode" } command { service = "OperServ"; name = "MODE"; command = "operserv/mode"; } +command { service = "OperServ"; name = "UMODE"; command = "operserv/umode"; } module { name = "os_modinfo" } command { service = "OperServ"; name = "MODINFO"; command = "operserv/modinfo"; } command { service = "OperServ"; name = "MODLIST"; command = "operserv/modlist"; } diff --git a/data/example.conf b/data/example.conf index 22a5ee201..d5bf7f9af 100644 --- a/data/example.conf +++ b/data/example.conf @@ -1421,7 +1421,7 @@ log * operserv/news operserv/stats operserv/kick * operserv/mode operserv/session operserv/modlist operserv/ignore * operserv/chankill operserv/akill operserv/sqline operserv/snline - * operserv/szline operserv/oper operserv/config + * operserv/szline operserv/oper operserv/config operserv/umode * operserv/modload operserv/jupe operserv/set operserv/noop * operserv/quit operserv/update operserv/reload operserv/restart * operserv/shutdown operserv/svsnick operserv/oline diff --git a/modules/core/os_mode.cpp b/modules/core/os_mode.cpp index 83b567e25..41f870d64 100644 --- a/modules/core/os_mode.cpp +++ b/modules/core/os_mode.cpp @@ -18,8 +18,8 @@ class CommandOSMode : public Command public: CommandOSMode(Module *creator) : Command(creator, "operserv/mode", 2, 2, "operserv/mode") { - this->SetDesc(_("Change channel or user modes")); - this->SetSyntax(_("{\037channel\037|\037user\037} \037modes\037")); + this->SetDesc(_("Change channel modes")); + this->SetSyntax(_("\037channel\037 \037modes\037")); } void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) @@ -28,46 +28,64 @@ class CommandOSMode : public Command const Anope::string &target = params[0]; const Anope::string &modes = params[1]; - if (target[0] == '#') + Channel *c = findchan(target); + if (!c) + source.Reply(CHAN_X_NOT_IN_USE, target.c_str()); + else if (c->bouncy_modes) + source.Reply(_("Services is unable to change modes. Are your servers' U:lines configured correctly?")); + else { - Channel *c = findchan(target); - if (!c) - source.Reply(CHAN_X_NOT_IN_USE, target.c_str()); - else if (c->bouncy_modes) - source.Reply(_("Services is unable to change modes. Are your servers' U:lines configured correctly?")); - else - { - c->SetModes(source.owner, false, modes.c_str()); - - Log(LOG_ADMIN, u, this) << modes << " on " << target; - } + c->SetModes(source.owner, false, modes.c_str()); + + Log(LOG_ADMIN, u, this) << modes << " on " << target; } + } + + bool OnHelp(CommandSource &source, const Anope::string &subcommand) + { + this->SendSyntax(source); + source.Reply(" "); + source.Reply(_("Allows Services operators to change modes for any channel.\n" + "Parameters are the same as for the standard /MODE command.")); + return true; + } +}; + +class CommandOSUMode : public Command +{ + public: + CommandOSUMode(Module *creator) : Command(creator, "operserv/umode", 2, 2, "operserv/umode") + { + this->SetDesc(_("Change channel or user modes")); + this->SetSyntax(_("\037user\037 \037modes\037")); + } + + void Execute(CommandSource &source, const std::vector<Anope::string> ¶ms) + { + User *u = source.u; + const Anope::string &target = params[0]; + const Anope::string &modes = params[1]; + + User *u2 = finduser(target); + if (!u2) + source.Reply(NICK_X_NOT_IN_USE, target.c_str()); else { - User *u2 = finduser(target); - if (!u2) - source.Reply(NICK_X_NOT_IN_USE, target.c_str()); - else - { - u2->SetModes(source.owner, "%s", modes.c_str()); - source.Reply(_("Changed usermodes of \002%s\002 to %s."), u2->nick.c_str(), modes.c_str()); - - u2->SendMessage(source.owner, _("\002%s\002 changed your usermodes to %s."), u->nick.c_str(), modes.c_str()); - - Log(LOG_ADMIN, u, this) << modes << " on " << target; - } - } + u2->SetModes(source.owner, "%s", modes.c_str()); + source.Reply(_("Changed usermodes of \002%s\002 to %s."), u2->nick.c_str(), modes.c_str()); + + u2->SendMessage(source.owner, _("\002%s\002 changed your usermodes to %s."), u->nick.c_str(), modes.c_str()); - return; + Log(LOG_ADMIN, u, this) << modes << " on " << target; + } } bool OnHelp(CommandSource &source, const Anope::string &subcommand) { this->SendSyntax(source); source.Reply(" "); - source.Reply(_("Allows Services operators to change modes for any channel or\n" - "user. Parameters are the same as for the standard /MODE\n" - "command.")); + source.Reply(_("Allows Services operators to change modes for any user.\n" + "Parameters are the same as for the standard /MODE command.")); return true; } }; @@ -75,14 +93,16 @@ class CommandOSMode : public Command class OSMode : public Module { CommandOSMode commandosmode; + CommandOSUMode commandosumode; public: OSMode(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), - commandosmode(this) + commandosmode(this), commandosumode(this) { this->SetAuthor("Anope"); ModuleManager::RegisterService(&commandosmode); + ModuleManager::RegisterService(&commandosumode); } }; |