X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/0d16e639f672a804cea43bd4b98684838b0d932d..c82735893e91d97cbb512a1a0ed68d320aa24ca7:/src/modcmd.c diff --git a/src/modcmd.c b/src/modcmd.c index 123a9ff..ba282df 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -1,7 +1,7 @@ /* modcmd.c - Generalized module command support * Copyright 2002-2004 srvx Development Team * - * This file is part of srvx. + * This file is part of x3. * * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,6 +18,7 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include "../ChangeLog.X3" #include "chanserv.h" #include "conf.h" #include "modcmd.h" @@ -54,6 +55,7 @@ static const struct message_entry msgtab[] = { { "MCMSG_NO_CHANNEL_BEFORE", "You may not give a channel name before this command." }, { "MCMSG_NO_PLUS_CHANNEL", "You may not use a +channel with this command." }, { "MCMSG_COMMAND_ALIASES", "%s is an alias for: %s" }, +/* { "MCMSG_HELP_COMMAND_ALIAS_FOR", "$bALIAS FOR:$b %s" },*/ { "MCMSG_HELP_COMMAND_ALIAS", "$uAlias for:$u %s" }, { "MCMSG_COMMAND_BINDING", "%s is a binding of: %s" }, { "MCMSG_ALIAS_ERROR", "Error in alias expansion for %s; check the error log for details." }, @@ -720,6 +722,7 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo } if (argc < cmd->command->min_argc) { send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name); + svccmd_send_help_brief(user, service->bot, cmd); return 0; } if (!cmd->command->func) { @@ -771,7 +774,11 @@ svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd * return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name); * TODO: We actually DO want to show the parent IF there is no other help. */ - r = send_help(user, bot, cmd->command->parent->helpfile, cmd->name); + r = send_help(user, bot, cmd->command->parent->helpfile, cmd->name); + if(cmd->command->name && strcasecmp(cmd->command->name, cmd->name)) + { + send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name); + } /* If it's an alias, show what it's an alias for. */ if (cmd->alias.used) { @@ -782,6 +789,41 @@ svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd return r; } +int +svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccmd *cmd) { + char cmdname[MAXLEN]; + unsigned int nn; + int r; + /* Show command name (in bold). */ + for (nn=0; cmd->name[nn]; nn++) + cmdname[nn] = toupper(cmd->name[nn]); + cmdname[nn] = 0; + + /* Show the help entry for the underlying command. */ + /* Lets not show help for a parent command, thats not what + * they asked for! + * return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name); + * TODO: We actually DO want to show the parent IF there is no other help. + */ + /* If it's an alias, show what it's an alias for. */ + if (cmd->alias.used) { + char alias_text[MAXLEN]; + unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text); + send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name); + } + r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->name); + if(!r) { + if(cmd->command->name) + { + send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, cmd->command->name); + r = send_help_brief(user, bot, cmd->command->parent->helpfile, cmd->command->name); + } + } + + return r; +} + + int svccmd_send_help_2(struct userNode *user, struct service *service, const char *topic) { struct module *module; @@ -882,12 +924,12 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv irc_notice_user(bot, user, response); } else if (!irccasecmp(text, "VERSION")) { /* This function provides copyright management information - * to end users of srvx. You should not alter, disable or + * to end users of X3. You should not alter, disable or * remove this command or its accessibility to normal IRC * users, except to add copyright information pertaining - * to changes you make to srvx. + * to changes you make to X3. */ - snprintf(response, sizeof(response), "\x01VERSION %s (%s) %s\x01", PACKAGE_STRING, CODENAME, ""); + snprintf(response, sizeof(response), "\x01VERSION %s\x01", PACKAGE_STRING); irc_notice_user(bot, user, response); } return; @@ -1861,11 +1903,25 @@ static MODCMD_FUNC(cmd_dump_messages) { static MODCMD_FUNC(cmd_version) { /* This function provides copyright management information to end - * users of srvx. You should not alter, disable or remove this + * users of X3. You should not alter, disable or remove this * command or its accessibility to normal IRC users, except to add - * copyright information pertaining to changes you make to srvx. + * copyright information pertaining to changes you make to X3. */ - send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b ("CODENAME"), Built: "__DATE__", "__TIME__".\nCopyright 2000-2004 srvx Development Team.\nThe srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net."); + send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b (Based on srvx 1.3), Built: "__DATE__", "__TIME__"."); + send_message_type(4, user, cmd->parent->bot, "("CVS_VERSION")"); + send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2005 srvx Development Team."); + send_message_type(4, user, cmd->parent->bot, "Copyright 2004-2005 X3 Development Team."); + send_message_type(4, user, cmd->parent->bot, "The srvx 1.3 Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others."); + send_message_type(4, user, cmd->parent->bot, "The X3 Development Team includes Alex Schumann, Reed Loden, Neil Spierling."); + send_message_type(4, user, cmd->parent->bot, "The X3 Development Team can be reached at http://sf.net/projects/x2serv/ or in #evilnet on irc.afternet.org."); + return 1; +} + +static void create_default_binds(int rebind); + +static MODCMD_FUNC(cmd_rebindall) { + send_message_type(4, user, cmd->parent->bot, "$bRe-binding all default commands to respective services..$b"); + create_default_binds(1); return 1; } @@ -2111,6 +2167,7 @@ modcmd_init(void) { modcmd_register(modcmd_module, "service privileged", cmd_service_privileged, 2, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "service remove", cmd_service_remove, 2, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "dumpmessages", cmd_dump_messages, 1, 0, "oper_level", "1000", NULL); + modcmd_register(modcmd_module, "rebindall", cmd_rebindall, 0, MODCMD_KEEP_BOUND, "oper_level", "800", NULL); version_command = modcmd_register(modcmd_module, "version", cmd_version, 1, 0, NULL); message_register_table(msgtab); } @@ -2276,7 +2333,7 @@ modcmd_saxdb_read(struct dict *db) { } static void -create_default_binds(void) { +create_default_binds(int rebind) { /* Which services should import which modules by default? */ struct { const char *svcname; @@ -2303,7 +2360,7 @@ create_default_binds(void) { continue; if (!(service = service_find(nick))) continue; - if (dict_size(service->commands) > 0) + if (dict_size(service->commands) > 0 && !rebind) continue; /* Bind the default modules for this service to it */ @@ -2321,6 +2378,7 @@ create_default_binds(void) { if (!irccasecmp(def_binds[ii].svcname, "ChanServ")) { service_make_alias(service, "addowner", "*chanserv.adduser", "$1", "owner", NULL); service_make_alias(service, "addcoowner", "*chanserv.adduser", "$1", "coowner", NULL); + service_make_alias(service, "addco", "*chanserv.adduser", "$1", "coowner", NULL); service_make_alias(service, "addmanager", "*chanserv.adduser", "$1", "manager", NULL); service_make_alias(service, "addop", "*chanserv.adduser", "$1", "op", NULL); service_make_alias(service, "addhop", "*chanserv.adduser", "$1", "halfop", NULL); @@ -2330,6 +2388,7 @@ create_default_binds(void) { service_make_alias(service, "delmanager", "*chanserv.deluser", "manager", "$1", NULL); service_make_alias(service, "delop", "*chanserv.deluser", "op", "$1", NULL); service_make_alias(service, "delpeon", "*chanserv.deluser", "peon", "$1", NULL); + service_make_alias(service, "llist", "*chanserv.lamers", "1", "$1", NULL); service_make_alias(service, "command", "*modcmd.command", NULL); service_make_alias(service, "god", "*modcmd.god", NULL); } else if (!irccasecmp(def_binds[ii].svcname, "OpServ")) { @@ -2379,7 +2438,7 @@ modcmd_finalize(void) { /* Check databases. */ saxdb_register("modcmd", modcmd_saxdb_read, modcmd_saxdb_write); - create_default_binds(); + create_default_binds(0); if (!saxdb_present) import_aliases_db();