X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/1d9574827a360322e344883a477c8f52f35ede2e..42ab13d2dc3e039ee35394dfb323e6d051b9c5c6:/src/modcmd.c?ds=sidebyside diff --git a/src/modcmd.c b/src/modcmd.c index f3c2df6..9f083e3 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -57,6 +57,7 @@ static const struct message_entry msgtab[] = { { "MCMSG_COMMAND_ALIASES", "%s is an alias for: %s" }, { "MCMSG_HELP_COMMAND_ALIAS", "$uAlias for:$u %s" }, { "MCMSG_HELP_COMMAND_HEADER", "Command help for: $b%s$b" }, + { "MCMSG_HELP_COMMAND_UNKNOWN", "No help available for that command." }, { "MCMSG_HELP_TOPIC_HEADER", "Help topic: $b%s$b" }, { "MCMSG_HELP_DIVIDER", "=---------------------------------------=" }, { "MCMSG_HELP_FOOTER", "=------------- End of Help -------------=" }, @@ -254,7 +255,7 @@ add_pending_template(struct svccmd *cmd, const char *target) { pending_templates = pending; } -static struct svccmd * +struct svccmd * svccmd_resolve_name(struct svccmd *origin, const char *name) { char *sep, svcname[MAXLEN]; @@ -755,7 +756,7 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo slvl = LOG_COMMAND; /* Unsplit argv after running the function to get the benefit * of any mangling/hiding done by the commands. */ - log_audit(cmd->command->parent->clog, slvl, user, service->bot, channel_name, ((flags & MODCMD_LOG_HOSTMASK) ? AUDIT_HOSTMASK : 0), unsplit_string(argv, argc, NULL)); + log_audit(cmd->command->parent->clog, slvl, user, service->bot, channel_name, AUDIT_HOSTMASK, unsplit_string(argv, argc, NULL)); } return 1; } @@ -783,12 +784,35 @@ svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccm return r; } +int is_joiner(struct svccmd *cmd) +{ + if(cmd->command->name) + { + if(strcasecmp("joiner", cmd->command->name)) + return(0); + else + return(1); + } + return(0); +/* + if(cmd->alias.used) + { + char alias_text[MAXLEN]; + unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text); + if(strcasecmp("joiner", alias_text)) + return(0); + else + return(1); + } +*/ +} + int svccmd_send_help(struct userNode *user, struct service *service, const char *topic) { struct module *module; struct svccmd *cmd; char cmdname[MAXLEN]; - unsigned int nn; + unsigned int nn, ii; int helpsent = 0; /* If there is no topic show the index */ @@ -799,8 +823,8 @@ svccmd_send_help(struct userNode *user, struct service *service, const char *top cmdname[nn] = toupper(topic[nn]); cmdname[nn] = 0; - /* If there is a command 'topic', send command help for the command */ - if ((cmd = dict_find(service->commands, topic, NULL))) + /* If there is a command 'topic', send command help for the command (unless its bound to JOINER) */ + if ((cmd = dict_find(service->commands, topic, NULL)) && !is_joiner(cmd)) { send_message(user, service->bot, "MCMSG_HELP_COMMAND_HEADER", cmdname); send_message(user, service->bot, "MCMSG_HELP_DIVIDER"); @@ -825,24 +849,33 @@ svccmd_send_help(struct userNode *user, struct service *service, const char *top } /* If send_help still couldnt find it, tell them sorry */ if(!helpsent) - send_message(user, service->bot, "MSG_TOPIC_UNKNOWN"); + send_message(user, service->bot, "MCMSG_HELP_COMMAND_UNKNOWN"); send_message(user, service->bot, "MCMSG_HELP_FOOTER"); return true; } else /* look for topic in the help files loaded to this nick/service */ { - /* Check for non command help in first primary help file, then - * check for help for this on another service and provide a tip */ - module = service->modules.list[0]; - if (module->helpfile && dict_find(module->helpfile->db, topic, NULL)) + /* Check for non command help in first primary help file, then next and so on */ + /* Note - we need to think about default bindings. see opserv.helpfiles */ + for(ii = 0; ii < service->modules.used; ii++) { - - send_message(user, service->bot, "MCMSG_HELP_TOPIC_HEADER", cmdname); - send_message(user, service->bot, "MCMSG_HELP_DIVIDER"); - if(!send_help(user, service->bot, module->helpfile, topic)) - send_message(user, service->bot, "MSG_TOPIC_UNKNOWN"); - send_message(user, service->bot, "MCMSG_HELP_FOOTER"); - return true; + module = service->modules.list[ii]; + if(!module->helpfile) + continue; + if(dict_find(module->helpfile->db, topic, NULL)) + { + if (module->helpfile && dict_find(module->helpfile->db, topic, NULL)) + { + + send_message(user, service->bot, "MCMSG_HELP_TOPIC_HEADER", cmdname); + send_message(user, service->bot, "MCMSG_HELP_DIVIDER"); + /* This should never fail but maybe if something is odd? */ + if(!send_help(user, service->bot, module->helpfile, topic)) + send_message(user, service->bot, "MSG_TOPIC_UNKNOWN"); + send_message(user, service->bot, "MCMSG_HELP_FOOTER"); + return true; + } + } } } /* Otherwise say we cant find it */ @@ -931,6 +964,9 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv */ snprintf(response, sizeof(response), "\x01VERSION %s\x01", PACKAGE_STRING); irc_notice_user(bot, user, response); + } else if (!irccasecmp(text, "GENDER")) { + snprintf(response, sizeof(response), "\x01GENDER ummm im still deciding\x01"); + irc_notice_user(bot, user, response); } return; } @@ -1265,8 +1301,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; @@ -1290,8 +1326,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; @@ -1494,17 +1530,17 @@ static MODCMD_FUNC(cmd_god) { reply("MCMSG_ALREADY_HELPING"); return 0; } - helping = 1; + helping = 1; } else if (disabled_string(argv[1])) { if (!HANDLE_FLAGGED(user->handle_info, HELPING)) { reply("MCMSG_ALREADY_NOT_HELPING"); return 0; } - helping = 0; + helping = 0; } else { reply("MSG_INVALID_BINARY", argv[1]); return 0; - } + } } else { helping = !IsHelping(user); }