-/* bots.c - NeonServ v5.5
+/* bots.c - NeonServ v5.6
* Copyright (C) 2011-2012 Philipp Kreil (pk910)
*
* This program is free software: you can redistribute it and/or modify
#include "modcmd.h"
#include "DBHelper.h"
#include "IRCEvents.h"
+#include "tools.h"
struct cmd_bot_alias {
int botid;
MYSQL_RES *res, *res2;
MYSQL_ROW row;
- printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind` FROM `bots` WHERE `botclass` = '0' AND `active` = '1'");
+ printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind`, `secret` FROM `bots` WHERE `botclass` = '0' AND `active` = '1'");
res = mysql_use();
while ((row = mysql_fetch_row(res)) != NULL) {
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);
+ client->flags |= (strcmp(row[11], "0") ? SOCKET_FLAG_SECRET_BOT : 0);
client->botid = 0;
client->clientid = atoi(row[7]);
connect_socket(client);
}
}
-void init_bots() {
- set_bot_alias(0, "0");
- start_zero_bots();
- set_trigger_callback(0, 0, zero_bots_trigger_callback);
- bind_bot_ready(zero_bots_bot_ready, 0);
-
+static TIMEQ_CALLBACK(load_timed_bans) {
MYSQL_RES *res;
MYSQL_ROW row;
- //load all timed bans
- printf_mysql_query("SELECT `ban_id`, `ban_timeout` FROM `bans` WHERE `ban_timeout` > 0");
+ //load all timed bans for the next 7 days
+ printf_mysql_query("SELECT `ban_id`, `ban_timeout` FROM `bans` WHERE `ban_timeout` > 0 AND `ban_timeout` < (UNIX_TIMESTAMP() + (86400 * 7))");
res = mysql_use();
char nameBuf[20];
while ((row = mysql_fetch_row(res)) != NULL) {
printf_mysql_query("DELETE FROM `bans` WHERE `ban_id` = '%s'", row[0]);
}
}
+ timeq_add(86400*7, 0, load_timed_bans, NULL);
+}
+
+void init_bots() {
+ set_bot_alias(0, "0");
+ start_zero_bots();
+ set_trigger_callback(0, 0, zero_bots_trigger_callback);
+ bind_bot_ready(zero_bots_bot_ready, 0);
+
+ timeq_add(10, 0, load_timed_bans, NULL);
+
}
struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) {
struct ChanUser *chanuser;
for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
if(botid && bot->botid != botid) continue;
- if((chanuser = getChanUser(bot->user, chan)) != NULL) {
- if((chanuser->flags & CHANUSERFLAG_OPPED)) {
+ if(!chan || (chanuser = getChanUser(bot->user, chan)) != NULL) {
+ if(chan && (chanuser->flags & CHANUSERFLAG_OPPED)) {
use_bot = bot;
if(bot->flags & SOCKET_FLAG_PREFERRED) break;
} else if(bot->flags & SOCKET_FLAG_PREFERRED)
}
void requestInvite(struct UserNode *user, struct ChanNode *chan) {
- struct ClientSocket *bot, *userbot = NULL;
+ struct ClientSocket *bot;
struct ChanUser *chanuser = getChanUser(user, chan);
char invited = 0;
if(chanuser) return;
invited = 1;
putsock(bot, "INVITE %s %s", user->nick, chan->name);
}
- if(bot->user == user) {
- userbot = bot;
- }
}
}