*
* This file is part of x3.
*
- * srvx is free software; you can redistribute it and/or modify
+ * x3 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.
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "../ChangeLog.X3"
+#include "../ChangeLog"
#include "chanserv.h"
#include "conf.h"
#include "modcmd.h"
+#include "opserv.h"
#include "saxdb.h"
+#include "timeq.h"
struct pending_template {
struct svccmd *cmd;
struct pending_template *next;
};
+extern unsigned long god_timeout;
static struct dict *modules;
static struct dict *services;
static struct pending_template *pending_templates;
{ "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 -------------=" },
{ "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." },
+ { "MCMSG_GOD_EXPIRED", "Security override expired." },
{ NULL, NULL }
};
struct userData *_GetChannelUser(struct chanData *channel, struct handle_info *handle, int override, int allow_suspended);
pending_templates = pending;
}
-static struct svccmd *
+struct svccmd *
svccmd_resolve_name(struct svccmd *origin, const char *name) {
char *sep, svcname[MAXLEN];
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;
}
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 */
if (!topic)
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");
- send_help(user, service->bot, cmd->command->parent->helpfile, cmd->name);
+ helpsent = send_help(user, service->bot, cmd->command->parent->helpfile, cmd->name);
/* Show if its an alias, or a binding of another command */
if (cmd->alias.used)
char alias_text[MAXLEN];
unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text);
send_message(user, service->bot, "MCMSG_HELP_COMMAND_ALIAS", alias_text);
+ /* If send_help above didnt work, try again with the referenced command.. */
+ if(!helpsent)
+ helpsent = send_help(user, service->bot, cmd->command->parent->helpfile, alias_text);
}
else if(cmd->command->name && strcasecmp(cmd->command->name, cmd->name))
{
send_message(user, service->bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name);
+ /* If send_help above didnt work, try again with the referenced command.. */
+ if(!helpsent)
+ helpsent = send_help(user, service->bot, cmd->command->parent->helpfile, cmd->command->name);
}
+ /* If send_help still couldnt find it, tell them sorry */
+ if(!helpsent)
+ 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");
- send_help(user, service->bot, module->helpfile, topic);
- 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 */
*/
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;
}
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;
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;
return changed;
}
+static void
+timeout_god(void *data)
+{
+ extern struct userNode *chanserv;
+ struct userNode *user = data;
+
+ if(!user || !IsHelping(user)) return;
+
+ HANDLE_CLEAR_FLAG(user->handle_info, HELPING);
+ send_message(user, chanserv, "MCMSG_GOD_EXPIRED");
+}
+
static MODCMD_FUNC(cmd_god) {
int helping;
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);
}
if (helping) {
HANDLE_SET_FLAG(user->handle_info, HELPING);
+ timeq_add(now + god_timeout, timeout_god, user);
reply("MCMSG_NOW_HELPING");
} else {
HANDLE_CLEAR_FLAG(user->handle_info, HELPING);
+ timeq_del(0, timeout_god, user, TIMEQ_IGNORE_WHEN);
reply("MCMSG_NOW_NOT_HELPING");
}
* command or its accessibility to normal IRC users, except to add
* copyright information pertaining to changes you make to X3.
*/
- 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.");
+
+ char *svn = NULL, *svnver = NULL, *svndate = NULL, *v = 0, ver[MAXLEN];
+ int vc = 0;
+
+ strcpy(ver, CVS_VERSION);
+ for (svn = x3_strtok(&v, ver, " "); svn;
+ svn = x3_strtok(&v, 0, " ")) {
+ if (vc == 2)
+ svnver = svn;
+ else if (vc == 3)
+ svndate = svn;
+ vc++;
+ }
+
+ 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, "$b$b");
+ send_message_type(4, user, cmd->parent->bot, "The srvx 1.3.x 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.");
+ send_message_type(4, user, cmd->parent->bot, "The X3 Development Team can be reached at http://sourceforge.net/projects/evilnet 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, "This program is free software; see COPYING in the distribution.");
+
return 1;
}
exp.type = HF_TABLE;
exp.value.table.length = 1;
exp.value.table.width = 1;
- exp.value.table.flags = TABLE_REPEAT_ROWS;
+ exp.value.table.flags = TABLE_REPEAT_ROWS | TABLE_NO_HEADERS;
exp.value.table.contents = calloc(dict_size(service->commands)+1, sizeof(char**));
exp.value.table.contents[0] = calloc(1, sizeof(char*));
- exp.value.table.contents[0][0] = "Commands:";
+ exp.value.table.contents[0][0] = "Commands";
dict_foreach(service->commands, append_entry, &exp);
return exp;
} else if (!irccasecmp(variable, "languages")) {
{ "Global", { "Global", NULL } },
{ "NickServ", { "NickServ", NULL } },
{ "OpServ", { "OpServ", "modcmd", "sendmail", "saxdb", "proxycheck", NULL } },
+ { "SpamServ", { "SpamServ", NULL } },
{ NULL, { NULL } }
};
unsigned int ii, jj;
projects / irc / evilnet / x3.git / blobdiff