-/* bots.c - NeonServ v5.2
- * Copyright (C) 2011 Philipp Kreil (pk910)
+/* bots.c - NeonServ v5.4
+ * 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
#include "modcmd.h"
#include "DBHelper.h"
-#include "bot_NeonServ.h"
-#include "bot_NeonSpam.h"
-#include "bot_DummyServ.h"
-#include "bot_NeonHelp.h"
-
struct cmd_bot_alias {
int botid;
char *alias;
client->clientid = atoi(row[7]);
connect_socket(client);
- printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access` FROM `bot_binds` WHERE `botclass` = '0' AND `botid` = '%d'", client->clientid);
+ printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access`, `flags` FROM `bot_binds` WHERE `botclass` = '0' AND `botid` = '%d'", client->clientid);
res2 = mysql_use();
while ((row = mysql_fetch_row(res2)) != NULL) {
if(bind_botwise_cmd_to_command(0, client->clientid, row[0], row[1])) {
if(row[4]) {
bind_botwise_set_channel_access(0, client->clientid, row[0], row[4]);
}
+ if(strcmp(row[5], "0"))
+ bind_botwise_set_bind_flags(0, client->clientid, row[0], atoi(row[5]));
}
}
bind_botwise_unbound_required_functions(0, client->clientid);
strcpy(trigger, "+");
return;
}
- printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
+ printf_mysql_query("SELECT `trigger`, `defaulttrigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
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] : "+"));
}
void init_bots() {
- init_NeonServ();
- init_NeonSpam();
- init_DummyServ();
- init_NeonHelp();
-
+ set_bot_alias(0, "0");
start_zero_bots();
- set_trigger_callback(0, zero_bots_trigger_callback);
+ set_trigger_callback(0, 0, zero_bots_trigger_callback);
MYSQL_RES *res;
MYSQL_ROW row;
while ((row = mysql_fetch_row(res)) != NULL) {
if(atol(row[1]) - time(0) > 0) {
sprintf(nameBuf, "ban_%s", row[0]);
- timeq_add_name(nameBuf, atol(row[1]) - time(0), channel_ban_timeout, strdup(row[0]));
+ timeq_add_name(nameBuf, atol(row[1]) - time(0), 0, channel_ban_timeout, strdup(row[0]));
} else {
//timed out
printf_mysql_query("DELETE FROM `bans` WHERE `ban_id` = '%s'", row[0]);
}
}
-void loop_bots() {
- loop_NeonServ();
- loop_NeonSpam();
- loop_DummyServ();
- loop_NeonHelp();
-}
-
-void free_bots() {
- free_NeonServ();
- free_NeonSpam();
- free_DummyServ();
- free_NeonHelp();
-}
-
struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) {
struct ClientSocket *bot, *use_bot = NULL, *second_bot = NULL, *third_bot = NULL;
struct ChanUser *chanuser;
if(!stricmp(botalias->alias, alias))
return botalias->botid;
}
- return 0;
+ return -1;
}