-/* bot_NeonSpam.c - NeonServ v5.2
- * Copyright (C) 2011 Philipp Kreil (pk910)
+/* bot_NeonSpam.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
};
static unsigned int convertNeonSpamSettingsToFlags(char *str);
-static int loadNeonSpamSettings(struct ChanNode *chan);
static void createSpamNode(struct ChanUser *chanuser);
static void freeJoinNode(struct NeonSpamJoinNode *joinnode);
static struct NeonSpamJoinNode *getNeonSpamJoinNode(struct ChanUser *chanuser);
}
}
-static void neonspam_trigger_callback(struct ChanNode *chan, char *trigger) {
+static void neonspam_trigger_callback(int clientid, struct ChanNode *chan, char *trigger) {
MYSQL_RES *res;
MYSQL_ROW row;
loadChannelSettings(chan);
- 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);
+ if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) {
+ strcpy(trigger, "~");
+ return;
+ }
+ 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 = mysql_fetch_row(res))) {
+ strcpy(trigger, "~");
+ return;
+ }
+ if(row[0] && *row[0])
+ strcpy(trigger, row[0]);
+ else
+ strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "~"));
}
static void start_bots() {
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);
return flags;
}
-static int loadNeonSpamSettings(struct ChanNode *chan) {
+int loadNeonSpamSettings(struct ChanNode *chan) {
if(chan->spam_settings) return 0;
struct NeonSpamSettings *settings = malloc(sizeof(*settings));
if(!settings) {