static struct pending_template *pending_templates;
static struct module *modcmd_module;
static struct modcmd *bind_command, *help_command, *version_command;
+unsigned short offchannel_allowed[256] = { 0 };
static const struct message_entry msgtab[] = {
{ "MCMSG_BARE_FLAG", "Flag %.*s must be preceded by a + or -." },
{ "MCMSG_UNKNOWN_FLAG", "Unknown module flag %.*s." },
{ "MCMSG_CURRENT_TRIGGER", "Trigger for $b%s$b is $b%c$b." },
{ "MCMSG_NEW_TRIGGER", "Changed trigger for $b%s$b to $b%c$b." },
{ "MCMSG_SERVICE_PRIVILEGED", "Service $b%s$b privileged: $b%s$b." },
+ { "MCMSG_OFFCHANNEL_IS_ON", "Off-channel use for $b%s$b (trigger $b%c$b) is enabled" },
+ { "MCMSG_OFFCHANNEL_IS_OFF", "Off-channel use for $b%s$b (trigger $b%c$b) is disabled" },
+ { "MCMSG_OFFCHANNEL_ON", "Enabled off-channel use for $b%s$b (trigger $b%c$b)" },
+ { "MCMSG_OFFCHANNEL_OFF", "Disabled off-channel use for $b%s$b (trigger $b%c$b)" },
{ "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." },
continue;
} else if (isdigit(argv[arg][1])) {
char *end_num;
- unsigned long tmp;
+ unsigned int tmp;
tmp = strtoul(argv[arg]+1, &end_num, 10);
+ (void)tmp;
switch (end_num[0]) {
case 0:
continue;
service = iter_data(it);
tbl.contents[ii] = calloc(tbl.width, sizeof(tbl.contents[ii][0]));
tbl.contents[ii][0] = service->bot->nick;
- tbl.contents[ii][1] = strtab(dict_size(service->commands));
+ tbl.contents[ii][1] = (service->commands && dict_size(service->commands) ? strtab(dict_size(service->commands)) : strtab(0));
tbl.contents[ii][2] = service->privileged ? "yes" : "no";
extra[ii*2] = service->trigger;
tbl.contents[ii][3] = extra+ii*2;
static MODCMD_FUNC(cmd_service_trigger) {
struct userNode *bogon;
struct service *service;
+ int old_oc = 0;
if (!(service = service_find(argv[1]))) {
reply("MCMSG_UNKNOWN_SERVICE", argv[1]);
reply("MCMSG_NO_TRIGGER", service->bot->nick);
return 1;
}
- if (service->trigger)
+ if (service->trigger) {
+ old_oc = offchannel_allowed[(unsigned char)service->trigger];
+ offchannel_allowed[(unsigned char)service->trigger] = 0;
reg_chanmsg_func(service->trigger, NULL, NULL);
+ }
if (!irccasecmp(argv[2], "none") || !irccasecmp(argv[2], "remove")) {
+ offchannel_allowed[(unsigned char)service->trigger] = 0;
service->trigger = 0;
reply("MCMSG_REMOVED_TRIGGER", service->bot->nick);
} else if ((bogon = get_chanmsg_bot(argv[2][0]))) {
return 1;
} else {
service->trigger = argv[2][0];
+ offchannel_allowed[(unsigned char)service->trigger] = old_oc;
reg_chanmsg_func(service->trigger, service->bot, modcmd_chanmsg);
reply("MCMSG_NEW_TRIGGER", service->bot->nick, service->trigger);
}
return 1;
}
+static MODCMD_FUNC(cmd_service_offchannel) {
+ struct service *service;
+
+ if (!(service = service_find(argv[1]))) {
+ reply("MCMSG_UNKNOWN_SERVICE", argv[1]);
+ return 0;
+ }
+
+ if(!service->trigger) {
+ reply("MCMSG_NO_TRIGGER", service->bot->nick);
+ return 0;
+ }
+
+ if(argc < 3) {
+ if(offchannel_allowed[(unsigned char)service->trigger])
+ reply("MCMSG_OFFCHANNEL_IS_ON", service->bot->nick, service->trigger);
+ else
+ reply("MCMSG_OFFCHANNEL_IS_OFF", service->bot->nick, service->trigger);
+ return 1;
+ }
+
+ if(enabled_string(argv[2])) {
+ offchannel_allowed[(unsigned char)service->trigger] = 1;
+ reply("MCMSG_OFFCHANNEL_ON", service->bot->nick, service->trigger);
+ } else if(disabled_string(argv[2])) {
+ offchannel_allowed[(unsigned char)service->trigger] = 0;
+ reply("MCMSG_OFFCHANNEL_OFF", service->bot->nick, service->trigger);
+ } else {
+ reply("MSG_INVALID_BINARY", argv[2]);
+ return 0;
+ }
+
+ return 1;
+}
+
static MODCMD_FUNC(cmd_service_privileged) {
struct service *service;
const char *newval;
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.");
+ 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.\nThis version has been modified by pk910 - visit #srvx @ irc.webgamesnet.net.");
return 1;
}
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) {
buff[0] = service->trigger;
buff[1] = '\0';
saxdb_write_string(ctx, "trigger", buff);
+ if(offchannel_allowed[(unsigned char)service->trigger])
+ saxdb_write_int(ctx, "offchannel", 1);
}
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);
- if (desc)
+ if (desc) {
svc->trigger = desc[0];
+ desc = database_get_data(rd->d.object, "offchannel", RECDB_QSTRING);
+ if(desc)
+ offchannel_allowed[(unsigned char)svc->trigger] = atoi(desc);
+ }
desc = database_get_data(rd->d.object, "privileged", RECDB_QSTRING);
if (desc && (true_string(desc) || enabled_string(desc)))
svc->privileged = 1;
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 offchannel", cmd_service_offchannel, 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);
struct svccmd *svccmd;
svccmd = service_make_alias(service, "stats", "*modcmd.joiner", NULL);
svccmd->min_opserv_level = 101;
+ svccmd = service_make_alias(service, "devnull", "*modcmd.joiner", NULL);
+ svccmd->min_opserv_level = 200;
svccmd = service_make_alias(service, "service", "*modcmd.joiner", NULL);
svccmd->min_opserv_level = 900;
}