X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/37d706b7c68d92c06269c369142adb86abacf967..8dc0685213ead3f8896c83cadc130143ccc4d181:/src/modcmd.c diff --git a/src/modcmd.c b/src/modcmd.c index d46d288..9b6576b 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -587,7 +587,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm } static int -svccmd_expand_alias(struct svccmd *cmd, unsigned int old_argc, char *old_argv[], char *new_argv[]) { +svccmd_expand_alias(struct svccmd *cmd, struct userNode *user, unsigned int old_argc, char *old_argv[], char *new_argv[]) { unsigned int ii, new_argc; char *arg; @@ -625,8 +625,24 @@ svccmd_expand_alias(struct svccmd *cmd, unsigned int old_argc, char *old_argv[], for (jj = lbound; jj <= ubound; ) new_argv[new_argc++] = old_argv[jj++]; } else { - log_module(MAIN_LOG, LOG_ERROR, "Alias expansion: I do not know how to handle %s (%s.%s arg %d).", arg, cmd->parent->bot->nick, cmd->name, ii); - return 0; + switch(arg[1]) { + case 'a': + new_argv[new_argc++] = (user && user->handle_info) ? user->handle_info->handle : "(account)"; + break; + case 'n': + new_argv[new_argc++] = user ? user->nick : "(nick)"; + break; + case 'm': +#ifdef WITH_PROTOCOL_P10 + new_argv[new_argc++] = user ? user->numeric : "(numnick)"; +#else + new_argv[new_argc++] = "(This ircd protocol has no numnicks!)"; +#endif + break; + default: + log_module(MAIN_LOG, LOG_ERROR, "Alias expansion: I do not know how to handle %s (%s.%s arg %d).", arg, cmd->parent->bot->nick, cmd->name, ii); + return 0; + } } } return new_argc; @@ -702,9 +718,9 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo /* Expand the alias arguments, if there are any. */ if (cmd->alias.used) { char *new_argv[MAXNUMPARAMS]; - argc = svccmd_expand_alias(cmd, argc, argv, new_argv); + argc = svccmd_expand_alias(cmd, user, argc, argv, new_argv); if (!argc) { - send_message(service->bot, user, "MCMSG_ALIAS_ERROR", cmd->name); + send_message(user, service->bot, "MCMSG_ALIAS_ERROR", cmd->name); return 0; } argv = new_argv; @@ -1083,8 +1099,16 @@ check_alias_args(char *argv[], unsigned int argc) { default: return arg; } - } else - return arg; + } else { + switch(argv[arg][1]) { + case 'a': + case 'n': + case 'm': + continue; + default: + return arg; + } + } } return arg; } @@ -1978,8 +2002,8 @@ static MODCMD_FUNC(cmd_version) { send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"+[%s %s]$b (Based on srvx 1.3.x), Built: "__DATE__", "__TIME__".", svnver, svndate); send_message_type(4, user, cmd->parent->bot, "$b$b"); - send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2006 srvx Development Team."); - send_message_type(4, user, cmd->parent->bot, "Copyright 2004-2006 X3 Development Team."); + send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2007 srvx Development Team."); + send_message_type(4, user, cmd->parent->bot, "Copyright 2004-2007 X3 Development Team."); send_message_type(4, user, cmd->parent->bot, "This software is OSI Certified Open Source Software."); send_message_type(4, user, cmd->parent->bot, "OSI Certified is a certification mark of the Open Source Initiative."); send_message_type(4, user, cmd->parent->bot, "$b$b"); @@ -1987,7 +2011,7 @@ static MODCMD_FUNC(cmd_version) { 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://evilnet.sourceforge.net or in #evilnet on irc.afternet.org."); send_message_type(4, user, cmd->parent->bot, "$b$b"); - send_message_type(4, user, cmd->parent->bot, "Thanks goes to Adrian M (thiefmaster), Joe Hansche (joeatrr), Martijn Smit (wasted), and to any other people who have contributed to X3."); + send_message_type(4, user, cmd->parent->bot, "Thanks goes to ThiefMaster, Joe Hansche (joeatrr), Martijn Smit (wasted), and to any other people who have contributed to X3."); send_message_type(4, user, cmd->parent->bot, "This program is free software; see COPYING in the distribution."); return 1; @@ -2453,13 +2477,13 @@ create_default_binds(int rebind) { /* Now some silly hax.. (aliases that most people want) */ 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); - service_make_alias(service, "addpeon", "*chanserv.adduser", "$1", "peon", NULL); + service_make_alias(service, "addowner", "*chanserv.adduser", "$1", "owner", "$2", NULL); + service_make_alias(service, "addcoowner", "*chanserv.adduser", "$1", "coowner", "$2", NULL); + service_make_alias(service, "addco", "*chanserv.adduser", "$1", "coowner", "$2", NULL); + service_make_alias(service, "addmanager", "*chanserv.adduser", "$1", "manager", "$2", NULL); + service_make_alias(service, "addop", "*chanserv.adduser", "$1", "op", "$2", NULL); + service_make_alias(service, "addhop", "*chanserv.adduser", "$1", "halfop", "$2", NULL); + service_make_alias(service, "addpeon", "*chanserv.adduser", "$1", "peon", "$2", NULL); service_make_alias(service, "delowner", "*chanserv.deluser", "owner", "$1", NULL); service_make_alias(service, "delcoowner", "*chanserv.deluser", "coowner", "$1", NULL); service_make_alias(service, "delmanager", "*chanserv.deluser", "manager", "$1", NULL);