*
* 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
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
#include "../ChangeLog"
#include "chanserv.h"
#include "conf.h"
+#include "compat.h"
#include "modcmd.h"
#include "opserv.h"
#include "saxdb.h"
#include "timeq.h"
+#include "version.h"
+
struct pending_template {
struct svccmd *cmd;
static struct dict *services;
static struct pending_template *pending_templates;
static struct module *modcmd_module;
-static struct modcmd *bind_command, *help_command, *version_command;
+static struct modcmd *bind_command, *help_command, *version_command, *credits_command;
static const struct message_entry msgtab[] = {
{ "MCMSG_BARE_FLAG", "Flag %.*s must be preceded by a + or -." },
{ "MCMSG_UNKNOWN_FLAG", "Unknown module flag %.*s." },
static struct modcmd_flag {
const char *name;
unsigned int flag;
-} flags[] = {
+} modcmd_flags[] = {
{ "acceptchan", MODCMD_ACCEPT_CHANNEL },
{ "acceptpluschan", MODCMD_ACCEPT_PCHANNEL },
{ "authed", MODCMD_REQUIRE_AUTHED },
return irccasecmp(fa->name, fb->name);
}
-DEFINE_LIST(svccmd_list, struct svccmd*);
-DEFINE_LIST(module_list, struct module*);
+DEFINE_LIST(svccmd_list, struct svccmd*)
+DEFINE_LIST(module_list, struct module*)
static void
free_service_command(void *data) {
return 0;
}
value++;
- flag = bsearch(value, flags, ArrayLength(flags)-1, sizeof(flags[0]), flags_bsearch);
+ flag = bsearch(value, modcmd_flags, ArrayLength(modcmd_flags)-1, sizeof(modcmd_flags[0]), flags_bsearch);
if (!flag) {
if (user)
send_message(user, bot, "MCMSG_UNKNOWN_FLAG", end, value);
*/
int
svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cmd, struct chanNode *channel, int options) {
+ extern struct userNode *chanserv;
unsigned int uData_checked = 0;
struct userData *uData = NULL;
int rflags = 0, flags = cmd->effective_flags;
return 0;
}
if (flags & MODCMD_REQUIRE_REGCHAN) {
- if (!channel->channel_info) {
+ if (!chanserv) {
+ /* Just use the inferred MODCMD_REQUIRE_CHANNEL. */
+ } else if (!channel->channel_info) {
if (options & SVCCMD_NOISY)
send_message(user, bot, "MCMSG_CHAN_NOT_REGISTERED", channel->name);
return 0;
} else if (IsSuspended(channel->channel_info) && !(flags & MODCMD_IGNORE_CSUSPEND)) {
- /* allow security-override users to always ignore channel suspensions, but flag it as a staff command */
- if (!user->handle_info
- || !HANDLE_FLAGGED(user->handle_info, HELPING)
- || (flags & MODCMD_NEVER_CSUSPEND)) {
+ /* Allow security-override users to ignore most channel
+ * suspensions, but flag that use as a staff command.
+ */
+ if (!IsHelping(user) || (flags & MODCMD_NEVER_CSUSPEND)) {
if (options & SVCCMD_NOISY)
send_message(user, bot, "MCMSG_CHAN_SUSPENDED", channel->name, channel->channel_info->suspended->reason);
return 0;
if (flags & MODCMD_REQUIRE_CHANUSER) {
if (!uData_checked)
uData = _GetChannelUser(channel->channel_info, user->handle_info, 1, 0), uData_checked = 1;
- if (!uData) {
+ if (!chanserv) {
+ /* Assume someone knows what they're doing. */
+ } else if (!uData) {
if (options & SVCCMD_NOISY)
send_message(user, bot, "MCMSG_NO_CHANNEL_ACCESS", channel->name);
return 0;
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)
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];
options = (server_qualified ? SVCCMD_QUALIFIED : 0) | SVCCMD_DEBIT | SVCCMD_NOISY;
/* Expand the alias arguments, if there are any. */
if (cmd->alias.used) {
char *new_argv[MAXNUMPARAMS];
- argc = svccmd_expand_alias(cmd, user, argc, argv, new_argv);
- if (!argc) {
+ int res;
+
+ res = svccmd_expand_alias(cmd, user, argc, argv, new_argv);
+ if (res < 0) {
+ send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name);
+ return 0;
+ } else if (res == 0) {
send_message(user, service->bot, "MCMSG_ALIAS_ERROR", cmd->name);
return 0;
}
+ argc = res;
argv = new_argv;
/* Try again to grab a handle to the channel after alias
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;
}
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;
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;
}
+char *cvs_verstring() {
+ static char verstring[MAXLEN] = { 0 };
+
+ if(!*verstring) {
+ 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++;
+ }
+ sprintf(verstring, "%s %s", svnver, svndate);
+ }
+ return verstring;
+}
+
+
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))) {
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 X3. 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 X3.
- */
- snprintf(response, sizeof(response), "\x01VERSION %s\x01", PACKAGE_STRING);
+ 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, char *text, struct userNode *bot) {
+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;
+ if (!(service = dict_find(services, bot->nick, NULL)))
+ return;
svccmd_invoke(user, service, chan, text, 0);
+ (void)is_notice;
}
struct service *
continue;
} else if (isdigit(argv[arg][1])) {
char *end_num;
+ unsigned long tmp;
- strtoul(argv[arg]+1, &end_num, 10);
+ tmp = strtoul(argv[arg]+1, &end_num, 10);
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.
*/
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) {
+ for (ii = buf1_used = buf2_used = 0; modcmd_flags[ii].name; ++ii) {
+ const struct modcmd_flag *flag = &modcmd_flags[ii];
+ if (target->flags & flag->flag) {
if (buf1_used)
buf1[buf1_used++] = ',';
- len = strlen(flags[ii].name);
- memcpy(buf1 + buf1_used, flags[ii].name, len);
+ len = strlen(flag->name);
+ memcpy(buf1 + buf1_used, flag->name, len);
buf1_used += len;
- } else if (target->effective_flags & flags[ii].flag) {
+ } else if (target->effective_flags & flag->flag) {
if (buf2_used)
buf2[buf2_used++] = ',';
- len = strlen(flags[ii].name);
- memcpy(buf2 + buf2_used, flags[ii].name, len);
+ len = strlen(flag->name);
+ memcpy(buf2 + buf2_used, flag->name, len);
buf2_used += len;
}
}
if (show_opserv_level)
tbl.contents[ii+1][1] = strtab(svccmd->min_opserv_level);
if (show_channel_access) {
- const char *access;
+ const char *access_name;
int flags = svccmd->effective_flags;
if (flags & MODCMD_REQUIRE_HELPING)
- access = "helping";
+ access_name = "helping";
else if (flags & MODCMD_REQUIRE_STAFF) {
if (flags & MODCMD_REQUIRE_OPER)
- access = "oper";
+ access_name = "oper";
else if (flags & MODCMD_REQUIRE_NETWORK_HELPER)
- access = "net.helper";
+ access_name = "net.helper";
else
- access = "staff";
+ access_name = "staff";
} else
- access = strtab(svccmd->min_channel_access);
- tbl.contents[ii+1][1+show_opserv_level] = access;
+ access_name = strtab(svccmd->min_channel_access);
+ tbl.contents[ii+1][1+show_opserv_level] = access_name;
}
}
svccmd_list_clean(&commands);
reply("MCMSG_ALREADY_SERVICE", bot->nick);
return 0;
}
- bot = AddService(nick, NULL, desc, hostname);
+ bot = AddLocalUser(nick, nick, hostname, desc, NULL);
service_register(bot);
reply("MCMSG_NEW_SERVICE", bot->nick);
return 1;
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;
reply("MSG_INTERNAL_FAILURE");
return 0;
}
- if ((res = setjmp(ctx->jbuf)) != 0) {
- ctx->complex.used = 0; /* to avoid false assert()s in close */
- saxdb_close_context(ctx);
- fclose(pf);
+
+ if ((res = setjmp(*saxdb_jmp_buf(ctx))) != 0) {
+ saxdb_close_context(ctx, 1);
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);
+ saxdb_close_context(ctx, 1);
reply("MCMSG_MESSAGES_DUMPED", fname);
return 1;
}
}
static MODCMD_FUNC(cmd_version) {
- /* This function provides copyright management information to end
- * users of X3. 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 X3.
- */
-
- 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]$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;
+}
- 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.");
+/* This function provides copyright management information to end
+ * users of X3. 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 X3.
+ */
+static MODCMD_FUNC(cmd_credits) {
+ send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE"$b is based on srvx");
+ send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2007 srvx Development Team.");
+ send_message_type(4, user, cmd->parent->bot, "Copyright 2004-2007 X3 Development Team.");
send_message_type(4, user, cmd->parent->bot, "This software is OSI Certified Open Source Software.");
send_message_type(4, user, cmd->parent->bot, "OSI Certified is a certification mark of the Open Source Initiative.");
send_message_type(4, user, cmd->parent->bot, "$b$b");
send_message_type(4, user, cmd->parent->bot, "The X3 Development Team can be reached at http://evilnet.sourceforge.net 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 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.");
+ send_message_type(4, user, cmd->parent->bot, "This program is free software; see COPYING in the distribution files.");
return 1;
}
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) {
+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_write_int(ctx, "channel_access", cmd->min_channel_access);
if (cmd->flags != template->flags) {
if (cmd->flags) {
- for (nn=pos=0; flags[nn].name; ++nn) {
- if (cmd->flags & flags[nn].flag) {
+ for (nn=pos=0; modcmd_flags[nn].name; ++nn) {
+ const struct modcmd_flag *flag = &modcmd_flags[nn];
+ if (cmd->flags & flag->flag) {
buf[pos++] = '+';
- len = strlen(flags[nn].name);
- memcpy(buf+pos, flags[nn].name, len);
+ len = strlen(flag->name);
+ memcpy(buf+pos, flag->name, len);
pos += len;
buf[pos++] = ',';
}
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(AddService(nick, NULL, desc, hostname));
+ 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);
void
modcmd_init(void) {
- qsort(flags, ArrayLength(flags)-1, sizeof(flags[0]), flags_qsort);
+ qsort(modcmd_flags, ArrayLength(modcmd_flags)-1, sizeof(modcmd_flags[0]), flags_qsort);
modules = dict_new();
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);
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);
modcmd_register(modcmd_module, "rebindall", cmd_rebindall, 0, MODCMD_KEEP_BOUND, "oper_level", "800", NULL);
version_command = modcmd_register(modcmd_module, "version", cmd_version, 1, 0, NULL);
+ credits_command = modcmd_register(modcmd_module, "credits", cmd_credits, 1, 0, NULL);
message_register_table(msgtab);
+
}
static void
/* Bind the help and version commands to this service */
service_bind_modcmd(service, help_command, help_command->name);
service_bind_modcmd(service, version_command, version_command->name);
+ service_bind_modcmd(service, credits_command, credits_command->name);
/* Now some silly hax.. (aliases that most people want) */
if (!irccasecmp(def_binds[ii].svcname, "ChanServ")) {
service_make_alias(service, "addop", "*chanserv.adduser", "$1", "op", "$2", NULL);
service_make_alias(service, "addhop", "*chanserv.adduser", "$1", "halfop", "$2", NULL);
service_make_alias(service, "addpeon", "*chanserv.adduser", "$1", "peon", "$2", NULL);
+ service_make_alias(service, "addpal", "*chanserv.adduser", "$1", "pal", "$2", NULL);
service_make_alias(service, "delowner", "*chanserv.deluser", "owner", "$1", NULL);
service_make_alias(service, "delcoowner", "*chanserv.deluser", "coowner", "$1", NULL);
service_make_alias(service, "delmanager", "*chanserv.deluser", "manager", "$1", NULL);
service_make_alias(service, "delop", "*chanserv.deluser", "op", "$1", NULL);
service_make_alias(service, "delpeon", "*chanserv.deluser", "peon", "$1", NULL);
+ service_make_alias(service, "delpal", "*chanserv.deluser", "pal", "$1", NULL);
service_make_alias(service, "llist", "*chanserv.lamers", "$1", NULL);
service_make_alias(service, "command", "*modcmd.command", NULL);
service_make_alias(service, "god", "*modcmd.god", NULL);
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. */