-/* bot_NeonServ.c - NeonServ v5.2
- * Copyright (C) 2011 Philipp Kreil (pk910)
+/* bot_NeonServ.c - NeonServ v5.3
+ * Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
{"NS_DNR_EXPIRES", "Expires"},
{"NS_DNR_REASON", "Reason"},
{"NS_STAFF_LOGGEDIN", "Logged in as"},
+ {"NS_BOTS_ID", "Id"},
{"NS_BOTS_NICK", "Nick"},
{"NS_BOTS_SERVER", "Server:Port(:Pass)"},
{"NS_BOTS_CLASS", "Bot Class"},
{"NS_BOTS_FLAGS", "Flags"},
{"NS_BOTS_CHANNELS", "Channels"},
{"NS_BOTS_TRIGGER", "Trigger"},
+ {"NS_NICKLIST_NICK", "Nick"},
+ {"NS_NICKLIST_STATE", "State"},
+ {"NS_NICKLIST_ACCESS", "Access"},
+ {"NS_NICKLIST_SYNC", "use `nicklist sync` to fix all red and orange entrys in the list above (add opped users with 200 and voiced with 100 access)"},
+ {"NS_SETBOT_UNKNOWN", "`%d` is an unknown botid."}, /* {ARGS: 50} */
+ {"NS_SETBOT_HEADER", "$bSettings for botid `%d`:$b"}, /* {ARGS: 50} */
+ {"NS_SETBOT_SETTING", "$b%s$b is an unknown bot setting."}, /* {ARGS: "strangeSetting"} */
+ {"NS_SETBOT_NICK_INVALID", "`%s` is an invalid botnick."}, /* {ARGS: "-SuperMagicBananaBotWithManyFunctions"} */
+ {"NS_SETBOT_NEED_RESTART", "You need to reconnect the bot to apply this setting."},
+ {"NS_SETBOT_PORT_INVALID", "`%s` is an invalid port number."}, /* {ARGS: "-1"} */
+ {"NS_SETBOT_INVALID_CLASS", "`%s` is an invalid botclass."}, /* {ARGS: "MistColaLeer"} */
+ {"NS_SETBOT_MAXCHAN_INVALID", "`%s` is an invalid maxchan value."}, /* {ARGS: "-1"} */
+ {"NS_SETBOT_PRIORITY_INVALID", "`%s` is an invalid priority value."}, /* {ARGS: "-1"} */
+ {"NS_SETBOT_TRIGGER_INVALID", "`%s` is an invalid bot trigger."}, /* {ARGS: "tooLongTrigger"} */
+ {"NS_SETBOT_TRIGGER_NOTE", "Please note: This Setting will only affect new channels."},
+ {"NS_ADDBOT_EXISTING", "A bot with nick %s does already exist."}, /* {ARGS: "NeonServ"} */
+ {"NS_ADDBOT_DONE", "Added %s with BotID $b%d$b."}, /* {ARGS: "NeonServ", 2} */
+ {"NS_DELBOT_NOT_FOUND", "Bot with BotID / nick $b%s$b not found."}, /* {ARGS: "NeonServ"} */
+ {"NS_DELBOT_DONE", "Bot deleted."},
+ {"NS_RECONNECT_DONE", "Reconnected bot."},
+ {"NS_MODCMD_SETTING", "$b%s$b is an unknown modcmd setting."}, /* {ARGS: "strangeSetting"} */
+ {"NS_MODCMD_HEADER", "$bSettings for command %s:$b"}, /* {ARGS: "access"} */
+ {"NS_MODCMD_OUTRANKED", "$b%s$b outranks you. (required access: %d)"}, /* {ARGS: "die", 1000} */
+ {"NS_MODCMD_STATIC_FLAG", "This Flag is added statically. It can't be modified manually."},
{NULL, NULL}
};
}
}
-static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) {
+static void neonserv_trigger_callback(int clientid, struct ChanNode *chan, char *trigger) {
MYSQL_RES *res;
MYSQL_ROW row;
loadChannelSettings(chan);
strcpy(trigger, "+");
return;
}
- printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
+ printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, BOTID);
res = mysql_use();
row = mysql_fetch_row(res);
- strcpy(trigger, (strlen(row[0]) ? row[0] : "+"));
+ if(row[0] && *row[0])
+ strcpy(trigger, row[0]);
+ else
+ strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "~"));
}
static void start_bots() {
MYSQL_RES *res, *res2;
MYSQL_ROW row;
- printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
+ printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
res = mysql_use();
while ((row = mysql_fetch_row(res)) != NULL) {
- client = create_socket(row[3], atoi(row[4]), row[5], row[0], row[1], row[2]);
+ client = create_socket(row[3], atoi(row[4]), row[10], row[5], row[0], row[1], row[2]);
client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0);
client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0);
client->flags |= (strcmp(row[9], "0") ? SOCKET_FLAG_SSL : 0);
connect_socket(client);
}
- printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access` FROM `bot_binds` WHERE `botclass` = '%d'", BOTID);
+ printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access`, `flags` FROM `bot_binds` WHERE `botclass` = '%d'", BOTID);
res2 = mysql_use();
while ((row = mysql_fetch_row(res2)) != NULL) {
if(bind_cmd_to_command(BOTID, row[0], row[1])) {
if(row[4]) {
bind_set_channel_access(BOTID, row[0], row[4]);
}
+ if(strcmp(row[5], "0"))
+ bind_set_bind_flags(BOTID, row[0], atoi(row[5]));
}
}
bind_unbound_required_functions(BOTID);