From 87dc82f3e95d7cc3fb4c055a8ec0a23a02c8783a Mon Sep 17 00:00:00 2001 From: rburchell Date: Tue, 10 Feb 2009 00:00:17 +0000 Subject: [PATCH] Convert cs_modes to new commands API.` git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1967 5417fbe8-f217-4b02-8779-1006273d7864 --- src/core/cs_modes.c | 595 +++++++++++++++++++++++++------------------- 1 file changed, 342 insertions(+), 253 deletions(-) diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index 090cc7afe..58d19549e 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -15,71 +15,6 @@ #include "module.h" -void myChanServHelp(User * u); -int do_util(User * u, CSModeUtil * util); -int do_op(User * u); -int do_deop(User * u); -int do_voice(User * u); -int do_devoice(User * u); -int do_halfop(User * u); -int do_dehalfop(User * u); -int do_protect(User * u); -int do_deprotect(User * u); -int do_owner(User * u); -int do_deowner(User * u); - -class CSModes : public Module -{ - public: - CSModes(const std::string &modname, const std::string &creator) : Module(modname, creator) - { - Command *c; - - this->SetAuthor("Anope"); - this->SetVersion("$Id$"); - this->SetType(CORE); - - c = createCommand("OP", do_op, NULL, CHAN_HELP_OP, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEOP", do_deop, NULL, CHAN_HELP_DEOP, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("VOICE", do_voice, NULL, CHAN_HELP_VOICE, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEVOICE", do_devoice, NULL, CHAN_HELP_DEVOICE, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - if (ircd->halfop) - { - c = createCommand("HALFOP", do_halfop, NULL, CHAN_HELP_HALFOP, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEHALFOP", do_dehalfop, NULL, CHAN_HELP_DEHALFOP, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - } - if (ircd->protect) - { - c = createCommand("PROTECT", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEPROTECT", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - } - if (ircd->owner) - { - c = createCommand("OWNER", do_owner, NULL, CHAN_HELP_OWNER, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEOWNER", do_deowner, NULL, CHAN_HELP_DEOWNER, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - } - if (ircd->admin) - { - c = createCommand("ADMIN", do_protect, NULL, CHAN_HELP_PROTECT, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - c = createCommand("DEADMIN", do_deprotect, NULL, CHAN_HELP_DEPROTECT, -1, -1, -1, -1); - this->AddCommand(CHANSERV, c, MOD_UNIQUE); - } - - this->SetChanHelp(myChanServHelp); - } -}; - /** * Add the help response to anopes /cs help output. * @param u The user who is requesting help @@ -108,198 +43,11 @@ void myChanServHelp(User * u) notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEVOICE); } -/** - * The /cs op/deop/voice/devoice etc.. commands. - * @param u The user who issued the command - * @param MOD_CONT to continue processing other modules, MOD_STOP to stop processing. - **/ - -int do_op(User * u) -{ - return do_util(u, &csmodeutils[MUT_OP]); -} - -/*************************************************************************/ - -int do_deop(User * u) -{ - return do_util(u, &csmodeutils[MUT_DEOP]); -} - -/*************************************************************************/ - -int do_voice(User * u) -{ - return do_util(u, &csmodeutils[MUT_VOICE]); -} - -/*************************************************************************/ - -int do_devoice(User * u) -{ - return do_util(u, &csmodeutils[MUT_DEVOICE]); -} - -/*************************************************************************/ - -int do_halfop(User * u) -{ - if (ircd->halfop) { - return do_util(u, &csmodeutils[MUT_HALFOP]); - } else { - return MOD_CONT; - } -} - -/*************************************************************************/ - -int do_dehalfop(User * u) -{ - if (ircd->halfop) { - return do_util(u, &csmodeutils[MUT_DEHALFOP]); - } else { - return MOD_CONT; - } -} - -/*************************************************************************/ - -int do_protect(User * u) -{ - if (ircd->protect || ircd->admin) { - return do_util(u, &csmodeutils[MUT_PROTECT]); - } else { - return MOD_CONT; - } -} - -/*************************************************************************/ - -int do_deprotect(User * u) -{ - if (ircd->protect || ircd->admin) { - return do_util(u, &csmodeutils[MUT_DEPROTECT]); - } else { - return MOD_CONT; - } -} - -/*************************************************************************/ - -int do_owner(User * u) -{ - const char *av[2]; - char *chan = strtok(NULL, " "); - - Channel *c; - ChannelInfo *ci; - struct u_chanlist *uc; - - if (!ircd->owner) { - return MOD_CONT; - } - - if (!chan) { - av[0] = ircd->ownerset; - av[1] = u->nick; - - /* Sets the mode to the user on every channels he is on. */ - - for (uc = u->chans; uc; uc = uc->next) { - if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN) - && is_founder(u, ci)) { - ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s", - av[0], u->nick); - chan_set_modes(s_ChanServ, uc->chan, 2, av, 1); - } - } - - return MOD_CONT; - } - - if (!(c = findchan(chan))) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); - } else if (!(ci = c->ci)) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name); - } else if (ci->flags & CI_VERBOTEN) { - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); - } else if (!is_on_chan(c, u)) { - notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u->nick, c->name); - } else if (!is_founder(u, ci)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); - } else { - ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset, - u->nick); - - av[0] = ircd->ownerset; - av[1] = u->nick; - chan_set_modes(s_ChanServ, c, 2, av, 1); - } - return MOD_CONT; -} - -/*************************************************************************/ - -int do_deowner(User * u) -{ - const char *av[2]; - char *chan = strtok(NULL, " "); - - Channel *c; - ChannelInfo *ci; - struct u_chanlist *uc; - - if (!ircd->owner) { - return MOD_CONT; - } - - if (!chan) { - av[0] = ircd->ownerunset; - av[1] = u->nick; - - /* Sets the mode to the user on every channels he is on. */ - - for (uc = u->chans; uc; uc = uc->next) { - if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN) - && is_founder(u, ci)) { - ircdproto->SendMode(whosends(ci), uc->chan->name, "%s %s", - av[0], u->nick); - chan_set_modes(s_ChanServ, uc->chan, 2, av, 1); - } - } - - return MOD_CONT; - } - - if (!(c = findchan(chan))) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); - } else if (!(ci = c->ci)) { - notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name); - } else if (ci->flags & CI_VERBOTEN) { - notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); - } else if (!is_on_chan(c, u)) { - notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u->nick, c->name); - } else if (!is_founder(u, ci)) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); - } else { - ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset, - u->nick); - - av[0] = ircd->ownerunset; - av[1] = u->nick; - chan_set_modes(s_ChanServ, c, 2, av, 1); - } - return MOD_CONT; -} - /* do_util: not a command, but does the job of other */ -int do_util(User * u, CSModeUtil * util) +static CommandReturn do_util(User *u, CSModeUtil *util, const char *chan, const char *nick) { const char *av[2]; - char *chan = strtok(NULL, " "); - char *nick = strtok(NULL, " "); - Channel *c; ChannelInfo *ci; User *u2; @@ -368,4 +116,345 @@ int do_util(User * u, CSModeUtil * util) return MOD_CONT; } + +class CommandCSOp : public Command +{ + public: + CommandCSOp() : Command("OP", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + return do_util(u, &csmodeutils[MUT_OP], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_OP); + return true; + } +}; + + +class CommandCSDeOp : public Command +{ + public: + CommandCSDeOp() : Command("DEOP", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + return do_util(u, &csmodeutils[MUT_DEOP], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_DEOP); + return true; + } +}; + + +class CommandCSVoice : public Command +{ + public: + CommandCSVoice() : Command("VOICE", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + return do_util(u, &csmodeutils[MUT_VOICE], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_VOICE); + return true; + } +}; + + +class CommandCSDeVoice : public Command +{ + public: + CommandCSDeVoice() : Command("DEVOICE", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + return do_util(u, &csmodeutils[MUT_DEVOICE], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_DEVOICE); + return true; + } +}; + + +class CommandCSHalfOp : public Command +{ + public: + CommandCSHalfOp() : Command("HALFOP", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + if (!ircd->halfop) + { + return MOD_CONT; + + } + + return do_util(u, &csmodeutils[MUT_HALFOP], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_HALFOP); + return true; + } +}; + + +class CommandCSDeHalfOp : public Command +{ + public: + CommandCSDeHalfOp() : Command("DEHALFOP", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + if (!ircd->halfop) + { + return MOD_CONT; + } + + return do_util(u, &csmodeutils[MUT_DEHALFOP], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_DEHALFOP); + return true; + } +}; + + +class CommandCSProtect : public Command +{ + public: + CommandCSProtect() : Command("PROTECT", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + if (!ircd->protect && !ircd->admin) + { + return MOD_CONT; + } + + return do_util(u, &csmodeutils[MUT_PROTECT], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_PROTECT); + return true; + } +}; + +/*************************************************************************/ + +class CommandCSDeProtect : public Command +{ + public: + CommandCSDeProtect() : Command("DEPROTECT", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + if (!ircd->protect && !ircd->admin) + { + return MOD_CONT; + } + + return do_util(u, &csmodeutils[MUT_DEPROTECT], params[0].c_str(), params[1].c_str()); + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_DEPROTECT); + return true; + } +}; + +/*************************************************************************/ + +class CommandCSOwner : public Command +{ + public: + CommandCSOwner() : Command("OWNER", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + const char *av[2]; + const char *chan = params[0].c_str(); + const char *nick = params[1].c_str(); + User *u2; + Channel *c; + ChannelInfo *ci; + + if (!ircd->owner) + { + return MOD_CONT; + } + + if (!(c = findchan(chan))) { + notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + } else if (!(ci = c->ci)) { + notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name); + } else if (ci->flags & CI_VERBOTEN) { + notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); + } else if (!(u2 = finduser(nick))) { + notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick); + } else if (!is_on_chan(c, u2)) { + notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); + } else if (!is_founder(u, ci)) { + notice_lang(s_ChanServ, u, ACCESS_DENIED); + } else { + ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerset, + u2->nick); + + av[0] = ircd->ownerset; + av[1] = u2->nick; + chan_set_modes(s_ChanServ, c, 2, av, 1); + } + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_OWNER); + return true; + } +}; + +/*************************************************************************/ + +class CommandCSDeOwner : public Command +{ + public: + CommandCSDeOwner() : Command("DEOWNER", 2, 2) + { + + } + + CommandReturn Execute(User *u, std::vector ¶ms) + { + const char *av[2]; + const char *chan = params[0].c_str(); + const char *nick = params[1].c_str(); + User *u2; + + Channel *c; + ChannelInfo *ci; + + if (!ircd->owner) { + return MOD_CONT; + } + + if (!(c = findchan(chan))) { + notice_lang(s_ChanServ, u, CHAN_X_NOT_IN_USE, chan); + } else if (!(ci = c->ci)) { + notice_lang(s_ChanServ, u, CHAN_X_NOT_REGISTERED, c->name); + } else if (ci->flags & CI_VERBOTEN) { + notice_lang(s_ChanServ, u, CHAN_X_FORBIDDEN, ci->name); + } else if (!(u2 = finduser(nick))) { + notice_lang(s_ChanServ, u, NICK_X_NOT_IN_USE, nick); + } else if (!is_on_chan(c, u2)) { + notice_lang(s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); + } else if (!is_founder(u, ci)) { + notice_lang(s_ChanServ, u, ACCESS_DENIED); + } else { + ircdproto->SendMode(whosends(ci), c->name, "%s %s", ircd->ownerunset, u2->nick); + + av[0] = ircd->ownerunset; + av[1] = u2->nick; + chan_set_modes(s_ChanServ, c, 2, av, 1); + } + return MOD_CONT; + } + + bool OnHelp(User *u, const std::string &subcommand) + { + notice_lang(s_ChanServ, u, CHAN_HELP_DEOWNER); + return true; + } +}; + + +class CSModes : public Module +{ + public: + CSModes(const std::string &modname, const std::string &creator) : Module(modname, creator) + { + this->SetAuthor("Anope"); + this->SetVersion("$Id$"); + this->SetType(CORE); + + this->AddCommand(CHANSERV, new CommandCSOp(), MOD_UNIQUE); + this->AddCommand(CHANSERV, new CommandCSDeOp(), MOD_UNIQUE); + this->AddCommand(CHANSERV, new CommandCSVoice(), MOD_UNIQUE); + this->AddCommand(CHANSERV, new CommandCSDeVoice(), MOD_UNIQUE); + + if (ircd->halfop) + { + this->AddCommand(CHANSERV, new CommandCSHalfOp(), MOD_UNIQUE); + this->AddCommand(CHANSERV, new CommandCSDeHalfOp(), MOD_UNIQUE); + } + + if (ircd->protect) + { + this->AddCommand(CHANSERV, new CommandCSProtect(), MOD_UNIQUE); + this->AddCommand(CHANSERV, new CommandCSDeProtect(), MOD_UNIQUE); + } + + if (ircd->admin) + { + this->AddCommand(CHANSERV, new CommandCSProtect(), MOD_UNIQUE); + this->AddCommand(CHANSERV, new CommandCSDeProtect(), MOD_UNIQUE); + } + + if (ircd->owner) + { + this->AddCommand(CHANSERV, new CommandCSOwner(), MOD_UNIQUE); + this->AddCommand(CHANSERV, new CommandCSDeOwner(), MOD_UNIQUE); + } + + this->SetChanHelp(myChanServHelp); + } +}; + + MODULE_INIT("cs_modes", CSModes)