X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fbots.c;h=7da678c97ffb3b4a185f9b0dea6b74f3c69431ae;hp=d239dffaeced9ff4bc0dd4489825fe8b8b469829;hb=f6bdc9d0fc8db22c265918f3325e11177fd001b9;hpb=5a9d04e79a4d27880eb5a588cbc50e00a4cd26aa diff --git a/src/bots.c b/src/bots.c index d239dff..7da678c 100644 --- a/src/bots.c +++ b/src/bots.c @@ -1,5 +1,5 @@ -/* bots.c - NeonServ v5.3 - * Copyright (C) 2011 Philipp Kreil (pk910) +/* bots.c - NeonServ v5.6 + * 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 @@ -25,11 +25,9 @@ #include "version.h" #include "modcmd.h" #include "DBHelper.h" - -#include "bot_NeonServ.h" -#include "bot_NeonSpam.h" -#include "bot_DummyServ.h" -#include "bot_NeonHelp.h" +#include "IRCEvents.h" +#include "tools.h" +#include "log.h" struct cmd_bot_alias { int botid; @@ -44,7 +42,7 @@ static void start_zero_bots() { 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) { @@ -52,6 +50,7 @@ static void start_zero_bots() { 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); @@ -87,52 +86,66 @@ static void zero_bots_trigger_callback(int clientid, struct ChanNode *chan, char } 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); + 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(); +static void zero_bots_bot_ready(struct ClientSocket *client) { + if(client->botid != 0) + return; + MYSQL_RES *res; + MYSQL_ROW row; - set_bot_alias(0, "0"); - start_zero_bots(); - set_trigger_callback(0, zero_bots_trigger_callback); + printf_mysql_query("SELECT `automodes`, `oper_user`, `oper_pass` FROM `bots` WHERE `id` = '%d'", client->clientid); + res = mysql_use(); + if ((row = mysql_fetch_row(res)) != NULL) { + if(row[1] && row[2]) { + putsock(client, "OPER %s %s", row[1], row[2]); + } + putsock(client, "MODE %s +%s", client->user->nick, row[0]); + } + + printf_mysql_query("SELECT `channel_name`, `channel_key` FROM `bot_channels` LEFT JOIN `channels` ON `chanid` = `channel_id` WHERE `botid` = '%d' AND `suspended` = '0'", client->clientid); + res = mysql_use(); + while ((row = mysql_fetch_row(res)) != NULL) { + putsock(client, "JOIN %s %s", row[0], row[1]); + } +} + +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) { 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]); } } + timeq_add(86400*7, 0, load_timed_bans, NULL); } -void loop_bots() { - loop_NeonServ(); - loop_NeonSpam(); - loop_DummyServ(); - loop_NeonHelp(); -} - -void free_bots() { - free_NeonServ(); - free_NeonSpam(); - free_DummyServ(); - free_NeonHelp(); +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) { @@ -140,8 +153,8 @@ 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) @@ -156,20 +169,38 @@ struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) { } void requestOp(struct UserNode *user, struct ChanNode *chan) { - struct ClientSocket *bot; + struct ClientSocket *bot, *userbot = NULL; struct ChanUser *chanuser = getChanUser(user, chan); char opped = 0; if(!chanuser) return; if((chanuser->flags & CHANUSERFLAG_OPPED)) return; for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) { - if((chanuser = getChanUser(bot->user, chan)) != NULL && (chanuser->flags & CHANUSERFLAG_OPPED)) { + if(!opped && (chanuser = getChanUser(bot->user, chan)) != NULL && (chanuser->flags & CHANUSERFLAG_OPPED)) { opped = 1; putsock(bot, "MODE %s +o %s", chan->name, user->nick); - break; + } + if(bot->user == user) { + userbot = bot; } } if(!opped) { - //self op? + if(userbot && (isUserModeSet(user, 'o') || isUserModeSet(user, 'O') || isUserModeSet(user, 'k') || isUserModeSet(user, 'X'))) { + putsock(userbot, "MODE %s +o %s", chan->name, user->nick); + putsock(userbot, "OPMODE %s +o %s", chan->name, user->nick); + } + } +} + +void requestInvite(struct UserNode *user, struct ChanNode *chan) { + struct ClientSocket *bot; + struct ChanUser *chanuser = getChanUser(user, chan); + char invited = 0; + if(chanuser) return; + for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) { + if(!invited && (chanuser = getChanUser(bot->user, chan)) != NULL && (chanuser->flags & CHANUSERFLAG_OPPED)) { + invited = 1; + putsock(bot, "INVITE %s %s", user->nick, chan->name); + } } } @@ -245,7 +276,7 @@ void set_bot_alias(int botid, char *alias) { } botalias = malloc(sizeof(*botalias)); if (!botalias) { - perror("malloc() failed"); + printf_log("main", LOG_ERROR, "%s:%d malloc() failed", __FILE__, __LINE__); return; } botalias->botid = botid;