#include "opserv.h"
#include "saxdb.h"
#include "timeq.h"
+#include "version.h"
struct pending_template {
static int
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;
+ char *arg, *altarg;
for (ii=new_argc=0; ii<cmd->alias.used; ++ii) {
+ altarg = NULL;
arg = cmd->alias.list[ii];
if (arg[0] != '$') {
new_argv[new_argc++] = arg;
lbound = strtoul(arg+1, &end_num, 10);
switch (end_num[0]) {
case 0: ubound = lbound; break;
+ case 'a':
+ altarg = (user && user->handle_info) ? user->handle_info->handle : "(account)";
+ break;
+ case 'n':
+ altarg = user ? user->nick : "(nick)";
+ break;
+ case 'm':
+#ifdef WITH_PROTOCOL_P10
+ altarg = user ? user->numeric : "(numnick)";
+#else
+ altarg = "(This ircd protocol has no numnicks!)";
+#endif
+ break;
case '-':
if (end_num[1] == 0) {
ubound = old_argc - 1;
log_module(MAIN_LOG, LOG_ERROR, "Alias expansion parse error in %s (near %s; %s.%s arg %d).", arg, end_num, cmd->parent->bot->nick, cmd->name, ii);
return 0;
}
+ if (altarg != NULL) {
+ if (end_num[1] != 0) {
+ if ((end_num[1] == '-') && (end_num[2] == 0))
+ ubound = old_argc - 1;
+ else if ((end_num[1] == '-') && (isdigit(end_num[2])))
+ ubound = strtoul(end_num+2, NULL, 10);
+ else {
+ log_module(MAIN_LOG, LOG_ERROR, "Alias expansion parse error in %s (near %s; %s.%s arg %d).", arg, end_num, cmd->parent->bot->nick, cmd->name, ii);
+ return 0;
+ }
+ } else {
+ ubound = lbound;
+ }
+ if (lbound >= old_argc)
+ new_argv[new_argc++] = altarg;
+ }
if (ubound >= old_argc)
ubound = old_argc - 1;
if (lbound < old_argc)
snprintf(response, sizeof(response), "\x01USERINFO %s\x01", bot->info);
irc_notice_user(bot, user, response);
} else if (!irccasecmp(text, "VERSION")) {
- snprintf(response, sizeof(response), "\x01VERSION %s+[%s]\x01", PACKAGE_STRING, cvs_verstring());
+ snprintf(response, sizeof(response), "\x01VERSION %s+[%s]\x01", PACKAGE_STRING, cvs_version);
irc_notice_user(bot, user, response);
} else if (!irccasecmp(text, "GENDER")) {
snprintf(response, sizeof(response), "\x01GENDER ummm im still deciding\x01");
}
void
-modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice) {
+modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice, UNUSED_ARG(void *extra)) {
struct service *service;
if (!(service = dict_find(services, bot->nick, NULL)))
return;
switch (end_num[0]) {
case 0:
continue;
+ case 'a':
+ case 'n':
+ case 'm':
+ if (end_num[1] == 0)
+ continue;
+ else if (end_num[1] == '-')
+ end_num++;
+ else
+ return arg;
case '-':
if (end_num[1] == 0)
continue;
}
static svccmd_unbind_func_t *suf_list;
+static void **suf_list_extra;
unsigned int suf_size, suf_used;
void
-reg_svccmd_unbind_func(svccmd_unbind_func_t handler) {
+reg_svccmd_unbind_func(svccmd_unbind_func_t handler, void *extra) {
if (suf_used == suf_size) {
if (suf_size) {
suf_size <<= 1;
suf_list = realloc(suf_list, suf_size*sizeof(svccmd_unbind_func_t));
+ suf_list_extra = realloc(suf_list_extra, suf_size*sizeof(void*));
} else {
suf_size = 8;
suf_list = malloc(suf_size*sizeof(svccmd_unbind_func_t));
+ suf_list_extra = malloc(suf_size*sizeof(void*));
}
}
- suf_list[suf_used++] = handler;
+ suf_list[suf_used] = handler;
+ suf_list_extra[suf_used++] = extra;
}
static MODCMD_FUNC(cmd_unbind) {
}
for (ii=0; ii<suf_used; ii++)
- suf_list[ii](bound);
+ suf_list[ii](bound, suf_list_extra[ii]);
/* If this command binding is removing itself, we must take care
* not to dereference it after the dict_remove.
*/
return 1;
}
if (service->trigger)
- reg_chanmsg_func(service->trigger, NULL, NULL);
+ reg_chanmsg_func(service->trigger, NULL, NULL, NULL);
if (!irccasecmp(argv[2], "none") || !irccasecmp(argv[2], "remove")) {
service->trigger = 0;
reply("MCMSG_REMOVED_TRIGGER", service->bot->nick);
return 1;
} else {
service->trigger = argv[2][0];
- reg_chanmsg_func(service->trigger, service->bot, modcmd_chanmsg);
+ reg_chanmsg_func(service->trigger, service->bot, modcmd_chanmsg, NULL);
reply("MCMSG_NEW_TRIGGER", service->bot->nick, service->trigger);
}
return 1;
}
static MODCMD_FUNC(cmd_version) {
- send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"+[%s]$b (Based on srvx 1.3.x), Built: "__DATE__", "__TIME__".", cvs_verstring());
+ send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"+[%s]$b (Based on srvx 1.3.x), Built: "__DATE__", "__TIME__".", cvs_version);
send_message_type(4, user, cmd->parent->bot, "See $bCREDITS$b for more information.");
return 1;
}
}
void
-modcmd_nick_change(struct userNode *user, const char *old_nick) {
+modcmd_nick_change(struct userNode *user, const char *old_nick, UNUSED_ARG(void *extra)) {
struct service *svc;
if (!(svc = dict_find(services, old_nick, NULL)))
return;
}
void
-modcmd_cleanup(void) {
+modcmd_cleanup(UNUSED_ARG(void* extra)) {
dict_delete(services);
dict_delete(modules);
if (suf_list)
free(suf_list);
+ if (suf_list_extra)
+ free(suf_list_extra);
}
static void
saxdb_start_record(ctx, "bots", 1);
for (it = dict_first(services); it; it = iter_next(it)) {
char buff[16];
+ char modes[32];
+
service = iter_data(it);
saxdb_start_record(ctx, service->bot->nick, 1);
if (service->trigger) {
}
saxdb_write_string(ctx, "description", service->bot->info);
saxdb_write_string(ctx, "hostname", service->bot->hostname);
+ if (service->bot->modes) {
+ irc_user_modes(service->bot, modes, sizeof(modes));
+ saxdb_write_string(ctx, "modes", modes);
+ }
if (service->privileged)
saxdb_write_string(ctx, "privileged", "1");
saxdb_end_record(ctx);
for (it = dict_first(db); it; it = iter_next(it)) {
struct record_data *rd;
struct service *svc;
- const char *nick, *desc, *hostname;
+ const char *nick, *desc, *hostname, *modes;
rd = iter_data(it);
if (rd->type != RECDB_OBJECT) {
svc = service_find(nick);
desc = database_get_data(rd->d.object, "description", RECDB_QSTRING);
hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING);
+ modes = database_get_data(rd->d.object, "modes", RECDB_QSTRING);
if (desc) {
if (!svc)
- svc = service_register(AddLocalUser(nick, nick, hostname, desc, NULL));
+ svc = service_register(AddLocalUser(nick, nick, hostname, desc, modes));
else if (hostname)
strcpy(svc->bot->hostname, hostname);
desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING);
dict_set_free_data(modules, free_module);
services = dict_new();
dict_set_free_data(services, free_service);
- reg_nick_change_func(modcmd_nick_change);
- reg_exit_func(modcmd_cleanup);
+ reg_nick_change_func(modcmd_nick_change, NULL);
+ reg_exit_func(modcmd_cleanup, NULL);
conf_register_reload(modcmd_conf_read);
modcmd_module = module_register("modcmd", MAIN_LOG, "modcmd.help", modcmd_expand);
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);
+ reg_chanmsg_func(svc->trigger, svc->bot, modcmd_chanmsg, NULL);
}
/* Resolve command rule-templates. */