X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodcmd.c;h=d84b25142f45327a2806e3eef407317bf4923879;hb=81af33175f966e57f1060936ea6f7092dc806abc;hp=027c06f94acf2a70424b5c3f1c91f8081e0e1e3b;hpb=b1329b979cf8b1be5f8e3908c0c7796bf14c0b2e;p=srvx.git diff --git a/src/modcmd.c b/src/modcmd.c index 027c06f..d84b251 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -1,5 +1,5 @@ /* modcmd.c - Generalized module command support - * Copyright 2002-2004 srvx Development Team + * Copyright 2002-2006 srvx Development Team * * This file is part of srvx. * @@ -18,7 +18,7 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "arch-version.h" +#include "git-version.h" #include "chanserv.h" #include "conf.h" #include "modcmd.h" @@ -145,18 +145,18 @@ static struct modcmd_flag { { "channel", MODCMD_REQUIRE_CHANNEL }, { "chanuser", MODCMD_REQUIRE_CHANUSER }, { "disabled", MODCMD_DISABLED }, + { "helping", MODCMD_REQUIRE_HELPING }, { "ignore_csuspend", MODCMD_IGNORE_CSUSPEND }, { "joinable", MODCMD_REQUIRE_JOINABLE }, { "keepbound", MODCMD_KEEP_BOUND }, { "loghostmask", MODCMD_LOG_HOSTMASK }, - { "nolog", MODCMD_NO_LOG }, { "networkhelper", MODCMD_REQUIRE_NETWORK_HELPER }, { "never_csuspend", MODCMD_NEVER_CSUSPEND }, + { "nolog", MODCMD_NO_LOG }, { "oper", MODCMD_REQUIRE_OPER }, { "qualified", MODCMD_REQUIRE_QUALIFIED }, { "regchan", MODCMD_REQUIRE_REGCHAN }, { "supporthelper", MODCMD_REQUIRE_SUPPORT_HELPER }, - { "helping", MODCMD_REQUIRE_HELPING }, { "toy", MODCMD_TOY }, { NULL, 0 } }; @@ -545,7 +545,8 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm rflags |= ACTION_STAFF; } if (cmd->min_opserv_level > 0) { - if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY))) return 0; + if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY))) + return 0; rflags |= ACTION_STAFF; } if (cmd->req_account_flags || cmd->deny_account_flags) { @@ -566,7 +567,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm /* If it's an override, return a special value. */ if ((flags & MODCMD_REQUIRE_CHANUSER) && (options & SVCCMD_NOISY) - && (uData->access > 500) + && (!uData || (uData->access > 500)) && (!(uData = _GetChannelUser(channel->channel_info, user->handle_info, 0, 0)) || uData->access < cmd->min_channel_access) && !(flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING))) { @@ -625,7 +626,7 @@ int svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNode *channel, unsigned int argc, char *argv[], unsigned int server_qualified) { extern struct userNode *chanserv; struct svccmd *cmd; - unsigned int cmd_arg, perms, flags, options; + unsigned int cmd_arg, perms, flags, options, result; char channel_name[CHANNELLEN+1]; /* First check pubcmd for the channel. */ @@ -736,11 +737,13 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo safestrncpy(channel_name, channel->name, sizeof(channel_name)); else channel_name[0] = 0; - if (!cmd->command->func(user, channel, argc, argv, cmd)) + if (!(result = cmd->command->func(user, channel, argc, argv, cmd))) return 0; if (!(flags & MODCMD_NO_LOG)) { enum log_severity slvl; - if (perms & ACTION_STAFF) + if (result & CMD_LOG_OVERRIDE) + slvl = LOG_OVERRIDE; + else if ((perms & ACTION_STAFF) || (result & CMD_LOG_STAFF)) slvl = LOG_STAFF; else if (perms & ACTION_OVERRIDE) slvl = LOG_OVERRIDE; @@ -794,9 +797,10 @@ svccmd_send_help_2(struct userNode *user, struct service *service, const char *t } static int -svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *channel, char *text, int server_qualified) { +svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *channel, const char *text, int server_qualified) { unsigned int argc; char *argv[MAXNUMPARAMS]; + char tmpline[MAXLEN]; if (!*text) return 0; @@ -814,12 +818,13 @@ svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *c return 0; } } - argc = split_line(text, false, ArrayLength(argv), argv); + safestrncpy(tmpline, text, sizeof(tmpline)); + argc = split_line(tmpline, false, ArrayLength(argv), argv); return argc ? svccmd_invoke_argv(user, service, channel, argc, argv, server_qualified) : 0; } void -modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int server_qualified) { +modcmd_privmsg(struct userNode *user, struct userNode *bot, const char *text, int server_qualified) { struct service *service; if (!(service = dict_find(services, bot->nick, NULL))) { @@ -852,10 +857,10 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv irc_notice_user(bot, user, "\001CLIENTINFO CLIENTINFO PING TIME USERINFO VERSION\x01"); } else if (!irccasecmp(text, "PING")) { if (term) { - snprintf(response, sizeof(response), "\x01PONG %s\x01", term); + snprintf(response, sizeof(response), "\x01PING %s\x01", term); irc_notice_user(bot, user, response); } else { - irc_notice_user(bot,user, "\x01PONG\x01"); + irc_notice_user(bot,user, "\x01PING\x01"); } } else if (!irccasecmp(text, "TIME")) { struct tm tm; @@ -872,7 +877,7 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv * users, except to add copyright information pertaining * to changes you make to srvx. */ - snprintf(response, sizeof(response), "\x01VERSION %s (%s) %s\x01", PACKAGE_STRING, CODENAME, ARCH_VERSION); + snprintf(response, sizeof(response), "\x01VERSION %s (%s) %s\x01", PACKAGE_STRING, CODENAME, GIT_VERSION); irc_notice_user(bot, user, response); } return; @@ -884,7 +889,7 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv } void -modcmd_chanmsg(struct userNode *user, struct chanNode *chan, char *text, struct userNode *bot) { +modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot) { struct service *service; if (!(service = dict_find(services, bot->nick, NULL))) return; svccmd_invoke(user, service, chan, text, 0); @@ -1464,7 +1469,7 @@ static MODCMD_FUNC(cmd_god) { } static MODCMD_FUNC(cmd_joiner) { - char cmdname[80]; + char cmdname[MAXLEN]; if (argc < 2) { int len = sprintf(cmdname, "%s ", cmd->name); @@ -1670,12 +1675,12 @@ static MODCMD_FUNC(cmd_showcommands) { if (flags & MODCMD_REQUIRE_HELPING) access = "helping"; else if (flags & MODCMD_REQUIRE_STAFF) { - switch (flags & MODCMD_REQUIRE_STAFF) { - case MODCMD_REQUIRE_OPER: access = "oper"; break; - case MODCMD_REQUIRE_OPER | MODCMD_REQUIRE_NETWORK_HELPER: - case MODCMD_REQUIRE_NETWORK_HELPER: access = "net.helper"; break; - default: access = "staff"; break; - } + if (flags & MODCMD_REQUIRE_OPER) + access = "oper"; + else if (flags & MODCMD_REQUIRE_NETWORK_HELPER) + access = "net.helper"; + else + access = "staff"; } else access = strtab(svccmd->min_channel_access); tbl.contents[ii+1][1+show_opserv_level] = access; @@ -1730,7 +1735,7 @@ static MODCMD_FUNC(cmd_service_add) { reply("MCMSG_ALREADY_SERVICE", bot->nick); return 0; } - bot = AddService(nick, desc, hostname); + bot = AddLocalUser(nick, nick, hostname, desc, NULL); service_register(bot); reply("MCMSG_NEW_SERVICE", bot->nick); return 1; @@ -1850,12 +1855,27 @@ static MODCMD_FUNC(cmd_version) { * command or its accessibility to normal IRC users, except to add * copyright information pertaining to changes you make to srvx. */ - 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 ("CODENAME"), Built: "__DATE__", "__TIME__". Copyright 2000-2006 srvx Development Team."); if ((argc > 1) && !irccasecmp(argv[1], "arch")) - send_message_type(4, user, cmd->parent->bot, "%s", ARCH_VERSION); + send_message_type(4, user, cmd->parent->bot, "%s", GIT_VERSION); + else + send_message_type(12, user, cmd->parent->bot, "The 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."); return 1; } +static MODCMD_FUNC(cmd_tell) { + struct userNode *target; + char *msg; + + target = GetUserH(argv[1]); + msg = unsplit_string(argv + 2, argc - 2, NULL); + if (!target) { + reply("MSG_NOT_TARGET_NAME"); + return 0; + } + send_message_type(MSG_TYPE_NOXLATE, target, cmd->parent->bot, "%s", msg); + return 1; +} void modcmd_nick_change(struct userNode *user, const char *old_nick) { @@ -2024,7 +2044,7 @@ modcmd_expand(const char *variable) { } static void -modcmd_load_bots(struct dict *db) { +modcmd_load_bots(struct dict *db, int default_nick) { dict_iterator_t it; for (it = dict_first(db); it; it = iter_next(it)) { @@ -2038,14 +2058,18 @@ modcmd_load_bots(struct dict *db) { continue; } nick = database_get_data(rd->d.object, "nick", RECDB_QSTRING); - if (!nick) - continue; + if (!nick) { + if (default_nick) + nick = iter_key(it); + else + continue; + } svc = service_find(nick); desc = database_get_data(rd->d.object, "description", RECDB_QSTRING); hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING); if (desc) { if (!svc) - svc = service_register(AddService(nick, desc, hostname)); + svc = service_register(AddLocalUser(nick, nick, hostname, desc, NULL)); else if (hostname) strcpy(svc->bot->hostname, hostname); desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING); @@ -2060,7 +2084,7 @@ modcmd_load_bots(struct dict *db) { static void modcmd_conf_read(void) { - modcmd_load_bots(conf_get_data("services", RECDB_OBJECT)); + modcmd_load_bots(conf_get_data("services", RECDB_OBJECT), 0); } void @@ -2094,6 +2118,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, "tell", cmd_tell, 3, 0, "flags", "+oper", NULL); version_command = modcmd_register(modcmd_module, "version", cmd_version, 1, 0, NULL); message_register_table(msgtab); } @@ -2204,7 +2229,7 @@ modcmd_saxdb_read(struct dict *db) { struct record_data *rd, *rd2; struct service *service; - modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT)); + modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT), 1); db2 = database_get_data(db, "services", RECDB_OBJECT); if (!db2) { log_module(MAIN_LOG, LOG_ERROR, "Missing section 'services' in modcmd db.");