X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodcmd.c;h=e41a1eaa1682aedf2a7e2185469c0be6bdd128bc;hb=113ef8305f6ba5f3c7df66294a7eb15dcb02e026;hp=1cb8399ca7051b4e94a10e34b71749f92a8e53c5;hpb=df4ec820bc0881507e3c2d8dfd9d28b6cd07eaa8;p=srvx.git diff --git a/src/modcmd.c b/src/modcmd.c index 1cb8399..e41a1ea 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -1,11 +1,12 @@ /* modcmd.c - Generalized module command support - * Copyright 2002-2004 srvx Development Team + * Copyright 2002-2007 srvx Development Team * - * This program is free software; you can redistribute it and/or modify + * This file is part of srvx. + * + * srvx is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. Important limitations are - * listed in the COPYING file that accompanies this software. + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,10 +14,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, email srvx-maintainers@srvx.net. + * along with srvx; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "arch-version.h" #include "chanserv.h" #include "conf.h" #include "modcmd.h" @@ -34,8 +35,7 @@ static struct pending_template *pending_templates; static struct module *modcmd_module; static struct modcmd *bind_command, *help_command, *version_command; static const struct message_entry msgtab[] = { - { "MCMSG_VERSION", "$b"PACKAGE_STRING"$b ("CODENAME"), Built: " __DATE__ ", " __TIME__"." }, - { "MCMSG_BARE_FLAG", "Flag %.*s must be preceeded by a + or -." }, + { "MCMSG_BARE_FLAG", "Flag %.*s must be preceded by a + or -." }, { "MCMSG_UNKNOWN_FLAG", "Unknown module flag %.*s." }, { "MCMSG_BAD_OPSERV_LEVEL", "Invalid $O access level %s." }, { "MCMSG_BAD_CHANSERV_LEVEL", "Invalid $C access level %s." }, @@ -118,6 +118,11 @@ static const struct message_entry msgtab[] = { { "MCMSG_SERVICE_REMOVED", "Service $b%s$b has been deleted." }, { "MCMSG_FILE_NOT_OPENED", "Unable to open file $b%s$b for writing." }, { "MCMSG_MESSAGES_DUMPED", "Messages written to $b%s$b." }, + { "MCMSG_MESSAGE_DUMP_FAILED", "Message dump failed: %s." }, + { "MCMSG_COMMAND_FLAGS", "Command flags are %s (inferred: %s)." }, + { "MCMSG_COMMAND_ACCOUNT_FLAGS", "Requires account flags +%s, prohibits account flags +%s." }, + { "MCMSG_COMMAND_ACCESS_LEVEL", "Requires channel access %d and $O access %d." }, + { "MCMSG_COMMAND_USES", "%s has been used %d times." }, { NULL, NULL } }; struct userData *_GetChannelUser(struct chanData *channel, struct handle_info *handle, int override, int allow_suspended); @@ -139,18 +144,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 } }; @@ -337,7 +342,7 @@ svccmd_configure(struct svccmd *cmd, struct userNode *user, struct userNode *bot return 1; } else if (!irccasecmp(param, "channel_level") || !irccasecmp(param, "channel_access") || !irccasecmp(param, "access")) { unsigned short ul; - if (!irccasecmp(value, "none")) { + if (!irccasecmp(value, "none") || !irccasecmp(value, "0")) { cmd->min_channel_access = 0; return 1; } else if ((ul = user_level_from_name(value, UL_OWNER)) > 0) { @@ -539,7 +544,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) { @@ -560,7 +566,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))) { @@ -619,7 +625,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. */ @@ -730,11 +736,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; @@ -788,9 +796,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; @@ -808,32 +817,85 @@ 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))) { log_module(MAIN_LOG, LOG_ERROR, "modcmd_privmsg got privmsg for unhandled service %s, unregistering.", bot->nick); reg_privmsg_func(bot, NULL); return; } + + if (text[0] == '\x01') { + char *term, response[MAXLEN]; + + text++; /* Skip leading ^A. */ + /* Chop off final ^A. */ + term = strchr(text, '\x01'); + if (!term) + return; + *term = '\0'; + /* Parse out leading text. */ + term = strchr(text, ' '); + if (term) { + *term++ = '\0'; + if (!*term) + term = NULL; + } + /* No dict lookup since these are so few. */ + if (!irccasecmp(text, "CLIENTINFO")) { + /* Use \001 instead of \x01 because apparently \x01C is + * interpreted as ASCII FS (\034, decimal 28, hex 1C). + */ + irc_notice_user(bot, user, "\001CLIENTINFO CLIENTINFO PING TIME USERINFO VERSION\x01"); + } else if (!irccasecmp(text, "PING")) { + if (term) { + snprintf(response, sizeof(response), "\x01PING %s\x01", term); + irc_notice_user(bot, user, response); + } else { + irc_notice_user(bot,user, "\x01PING\x01"); + } + } else if (!irccasecmp(text, "TIME")) { + struct tm tm; + localtime_r(&now, &tm); + strftime(response, sizeof(response), "\x01TIME %a %b %d %H:%M:%S %Y\x01", &tm); + irc_notice_user(bot, user, response); + } else if (!irccasecmp(text, "USERINFO")) { + snprintf(response, sizeof(response), "\x01USERINFO %s\x01", bot->info); + 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 + * remove this command or its accessibility to normal IRC + * 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, git_version); + irc_notice_user(bot, user, response); + } + return; + } + if (service->msg_hook && service->msg_hook(user, bot, text, server_qualified)) return; svccmd_invoke(user, service, NULL, text, server_qualified); } 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); } struct service * -service_register(struct userNode *bot, char trigger) { +service_register(struct userNode *bot) { struct service *service; if ((service = dict_find(services, bot->nick, NULL))) return service; @@ -841,12 +903,9 @@ service_register(struct userNode *bot, char trigger) { module_list_init(&service->modules); service->commands = dict_new(); service->bot = bot; - service->trigger = trigger; dict_set_free_data(service->commands, free_service_command); dict_insert(services, service->bot->nick, service); reg_privmsg_func(bot, modcmd_privmsg); - if (trigger) - reg_chanmsg_func(trigger, bot, modcmd_chanmsg); return service; } @@ -1153,8 +1212,8 @@ static MODCMD_FUNC(cmd_readhelp) { stop.tv_sec -= start.tv_sec; stop.tv_usec -= start.tv_usec; if (stop.tv_usec < 0) { - stop.tv_sec -= 1; - stop.tv_usec += 1000000; + stop.tv_sec -= 1; + stop.tv_usec += 1000000; } reply("MCMSG_HELPFILE_READ", module->name, stop.tv_sec, stop.tv_usec/1000); return 1; @@ -1178,8 +1237,8 @@ static MODCMD_FUNC(cmd_timecmd) { stop.tv_sec -= start.tv_sec; stop.tv_usec -= start.tv_usec; if (stop.tv_usec < 0) { - stop.tv_sec -= 1; - stop.tv_usec += 1000000; + stop.tv_sec -= 1; + stop.tv_usec += 1000000; } reply("MCMSG_COMMAND_TIME", cmd_text, stop.tv_sec, stop.tv_usec); return 1; @@ -1298,6 +1357,54 @@ static MODCMD_FUNC(cmd_command) { return 1; } +static void +modcmd_describe_command(struct userNode *user, struct svccmd *cmd, struct svccmd *target) { + char buf1[MAXLEN], buf2[MAXLEN]; + unsigned int ii, len, buf1_used, buf2_used; + + if (target->alias.used) { + unsplit_string((char**)target->alias.list, target->alias.used, buf1); + reply("MCMSG_COMMAND_ALIASES", target->name, buf1); + } else { + snprintf(buf1, sizeof(buf1), "%s.%s", target->command->parent->name, target->command->name); + reply("MCMSG_COMMAND_BINDING", target->name, buf1); + } + for (ii = buf1_used = buf2_used = 0; flags[ii].name; ++ii) { + if (target->flags & flags[ii].flag) { + if (buf1_used) + buf1[buf1_used++] = ','; + len = strlen(flags[ii].name); + memcpy(buf1 + buf1_used, flags[ii].name, len); + buf1_used += len; + } else if (target->effective_flags & flags[ii].flag) { + if (buf2_used) + buf2[buf2_used++] = ','; + len = strlen(flags[ii].name); + memcpy(buf2 + buf2_used, flags[ii].name, len); + buf2_used += len; + } + } + if (buf1_used) + buf1[buf1_used] = '\0'; + else + strcpy(buf1, user_find_message(user, "MSG_NONE")); + if (buf2_used) + buf2[buf2_used] = '\0'; + else + strcpy(buf2, user_find_message(user, "MSG_NONE")); + reply("MCMSG_COMMAND_FLAGS", buf1, buf2); + for (ii = buf1_used = buf2_used = 0; handle_flags[ii]; ++ii) { + if (target->req_account_flags & (1 << ii)) + buf1[buf1_used++] = handle_flags[ii]; + else if (target->deny_account_flags & (1 << ii)) + buf2[buf2_used++] = handle_flags[ii]; + } + buf1[buf1_used] = buf2[buf2_used] = '\0'; + reply("MCMSG_COMMAND_ACCOUNT_FLAGS", buf1, buf2); + reply("MCMSG_COMMAND_ACCESS_LEVEL", target->min_channel_access, target->min_opserv_level); + reply("MCMSG_COMMAND_USES", target->name, target->uses); +} + static MODCMD_FUNC(cmd_modcmd) { struct svccmd *svccmd; unsigned int arg, changed; @@ -1305,7 +1412,7 @@ static MODCMD_FUNC(cmd_modcmd) { assert(argc >= 2); arg = collapse_cmdname(argv+1, argc-1, cmdname) + 1; - if (!arg || (arg+2 < argc)) { + if (!arg) { reply("MSG_MISSING_PARAMS", cmd->name); return 0; } @@ -1313,16 +1420,15 @@ static MODCMD_FUNC(cmd_modcmd) { reply("MCMSG_UNKNOWN_COMMAND_2", cmdname, cmd->parent->bot->nick); return 0; } - changed = 0; - while (arg+1 < argc) { + for (changed = 0; arg+1 < argc; arg += 2) { if (svccmd_configure(svccmd, user, cmd->parent->bot, argv[arg], argv[arg+1])) { reply("MCMSG_COMMAND_MODIFIED", argv[arg], svccmd->name); changed = 1; } - arg += 2; } if (changed) modcmd_set_effective_flags(svccmd); + modcmd_describe_command(user, cmd, svccmd); return changed; } @@ -1362,7 +1468,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); @@ -1568,12 +1674,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; @@ -1613,7 +1719,7 @@ static MODCMD_FUNC(cmd_helpfiles) { } static MODCMD_FUNC(cmd_service_add) { - const char *nick, *desc; + const char *nick, *hostname, *desc; struct userNode *bot; nick = argv[1]; @@ -1621,14 +1727,15 @@ static MODCMD_FUNC(cmd_service_add) { reply("MCMSG_BAD_SERVICE_NICK", nick); return 0; } - desc = unsplit_string(argv+2, argc-2, NULL); + hostname = argv[2]; + desc = unsplit_string(argv+3, argc-3, NULL); bot = GetUserH(nick); if (bot && IsService(bot)) { reply("MCMSG_ALREADY_SERVICE", bot->nick); return 0; } - bot = AddService(nick, desc); - service_register(bot, '\0'); + bot = AddLocalUser(nick, nick, hostname, desc, NULL); + service_register(bot); reply("MCMSG_NEW_SERVICE", bot->nick); return 1; } @@ -1715,6 +1822,7 @@ static MODCMD_FUNC(cmd_dump_messages) { struct saxdb_context *ctx; dict_iterator_t it; FILE *pf; + int res; if (!(pf = fopen(fname, "w"))) { reply("MCMSG_FILE_NOT_OPENED", fname); @@ -1724,22 +1832,49 @@ static MODCMD_FUNC(cmd_dump_messages) { reply("MSG_INTERNAL_FAILURE"); return 0; } - for (it = dict_first(lang_C->messages); it; it = iter_next(it)) - saxdb_write_string(ctx, iter_key(it), iter_data(it)); - saxdb_close_context(ctx); - fclose(pf); - reply("MCMSG_MESSAGES_DUMPED", fname); - return 1; + if ((res = setjmp(ctx->jbuf)) != 0) { + ctx->complex.used = 0; /* to avoid false assert()s in close */ + saxdb_close_context(ctx); + fclose(pf); + reply("MCMSG_MESSAGE_DUMP_FAILED", strerror(res)); + return 0; + } else { + for (it = dict_first(lang_C->messages); it; it = iter_next(it)) + saxdb_write_string(ctx, iter_key(it), iter_data(it)); + saxdb_close_context(ctx); + fclose(pf); + reply("MCMSG_MESSAGES_DUMPED", fname); + return 1; + } } static MODCMD_FUNC(cmd_version) { - reply("MCMSG_VERSION"); - send_message_type(4, user, cmd->parent->bot, "Copyright 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."); - if ((argc > 1) && !irccasecmp(argv[1], "arch")) - send_message_type(4, user, cmd->parent->bot, "%s", ARCH_VERSION); + /* This function provides copyright management information to end + * users of srvx. 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. + */ + send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b ("CODENAME"), Built: "__DATE__", "__TIME__". Copyright 2000-2007 srvx Development Team."); + if (argc > 1) + 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) { @@ -1829,6 +1964,7 @@ modcmd_saxdb_write(struct saxdb_context *ctx) { saxdb_write_string(ctx, "trigger", buff); } saxdb_write_string(ctx, "description", service->bot->info); + saxdb_write_string(ctx, "hostname", service->bot->hostname); if (service->privileged) saxdb_write_string(ctx, "privileged", "1"); saxdb_end_record(ctx); @@ -1907,14 +2043,13 @@ 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)) { struct record_data *rd; - struct userNode *bot; - const char *nick, *desc; - char trigger; + struct service *svc; + const char *nick, *desc, *hostname; rd = iter_data(it); if (rd->type != RECDB_OBJECT) { @@ -1922,18 +2057,23 @@ modcmd_load_bots(struct dict *db) { continue; } nick = database_get_data(rd->d.object, "nick", RECDB_QSTRING); - if (!nick) - nick = iter_key(it); - if (service_find(nick)) - continue; - desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING); - trigger = desc ? desc[0] : '\0'; + 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); - if (desc) - { - struct service *svc; - bot = AddService(nick, desc); - svc = service_register(bot, trigger); + hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING); + if (desc) { + if (!svc) + 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); + if (desc) + svc->trigger = desc[0]; desc = database_get_data(rd->d.object, "privileged", RECDB_QSTRING); if (desc && (true_string(desc) || enabled_string(desc))) svc->privileged = 1; @@ -1943,7 +2083,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 @@ -1961,7 +2101,7 @@ modcmd_init(void) { bind_command = modcmd_register(modcmd_module, "bind", cmd_bind, 4, MODCMD_KEEP_BOUND, "oper_level", "800", NULL); help_command = modcmd_register(modcmd_module, "help", cmd_help, 1, 0, "flags", "+nolog", NULL); modcmd_register(modcmd_module, "command", cmd_command, 2, 0, "flags", "+nolog", NULL); - modcmd_register(modcmd_module, "modcmd", cmd_modcmd, 4, MODCMD_KEEP_BOUND, "template", "bind", NULL); + modcmd_register(modcmd_module, "modcmd", cmd_modcmd, 2, MODCMD_KEEP_BOUND, "template", "bind", NULL); modcmd_register(modcmd_module, "god", cmd_god, 0, MODCMD_REQUIRE_AUTHED, "flags", "+oper,+networkhelper", NULL); modcmd_register(modcmd_module, "readhelp", cmd_readhelp, 2, 0, "oper_level", "650", NULL); modcmd_register(modcmd_module, "timecmd", cmd_timecmd, 2, 0, "oper_level", "1", NULL); @@ -1971,12 +2111,13 @@ modcmd_init(void) { modcmd_register(modcmd_module, "stats services", cmd_stats_services, 1, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "showcommands", cmd_showcommands, 1, 0, "flags", "+acceptchan", NULL); modcmd_register(modcmd_module, "helpfiles", cmd_helpfiles, 2, 0, "template", "bind", NULL); - modcmd_register(modcmd_module, "service add", cmd_service_add, 3, 0, "flags", "+oper", NULL); + modcmd_register(modcmd_module, "service add", cmd_service_add, 4, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "service rename", cmd_service_rename, 3, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "service trigger", cmd_service_trigger, 2, 0, "flags", "+oper", NULL); 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); } @@ -2087,7 +2228,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."); @@ -2240,12 +2381,21 @@ import_aliases_db() { void modcmd_finalize(void) { + dict_iterator_t it; + /* Check databases. */ saxdb_register("modcmd", modcmd_saxdb_read, modcmd_saxdb_write); create_default_binds(); if (!saxdb_present) import_aliases_db(); + /* Register services for their triggers. */ + for (it = dict_first(services); it; it = iter_next(it)) { + struct service *svc = iter_data(it); + if (svc->trigger) + reg_chanmsg_func(svc->trigger, svc->bot, modcmd_chanmsg); + } + /* Resolve command rule-templates. */ while (pending_templates) { struct pending_template *ptempl = pending_templates;