X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbot_NeonServ.c;h=53ad3512f03ab090b8531bdad6ba896e616b91be;hb=c575e458c6257e75b97884847143b20965a5dfda;hp=5336737b181a1d88d8a404e386fb31c62db99c98;hpb=cfa2d59a5d372fdd4fe32dad4f6d1ef8d3af71b2;p=NeonServV5.git diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c index 5336737..53ad351 100644 --- a/src/bot_NeonServ.c +++ b/src/bot_NeonServ.c @@ -1,4 +1,4 @@ -/* bot_NeonServ.c - NeonServ v5.1 +/* bot_NeonServ.c - NeonServ v5.2 * Copyright (C) 2011 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -32,7 +32,6 @@ #include "DBHelper.h" #include "tools.h" #include "timeq.h" -#include "version.h" #include "EventLogger.h" #include "cmd_neonserv.h" @@ -223,6 +222,7 @@ static const struct default_language_entry msgtab[] = { {"NS_REGISTER_FULL", "the bot can not join more channels."}, {"NS_REGISTER_DISCONNECTED", "%s has been registered with a Bot, that is currently NOT connected. The Bot should join the channel, when it reconnects to the IRC-Network."}, /* {ARGS: "#TestChan"} */ {"NS_REGISTER_DONE", "$b%s$b is now registered to $b%s$b."}, /* {ARGS: "#TestChan", "TestUser"} */ + {"NS_REGISTER_DONE_NOAUTH", "$b%s$b is now registered."}, /* {ARGS: "#TestChan"} */ {"NS_UNREGISTER_NOT_REGISTERED", "$b%s$b is not registered with %s."}, /* {ARGS: "#TestChan", "NeonServ"} */ {"NS_UNREGISTER_DONE", "$b%s$b unregistered."}, /* {ARGS: "#TestChan"} */ {"NS_RECOVER_DONE", "$b%s$b has been recovered."}, /* {ARGS: "#TestChan"} */ @@ -340,24 +340,9 @@ cmd_neonserv_calc.c #include "event_neonserv_invite.c" #include "event_neonserv_topic.c" + struct ClientSocket *getBotForChannel(struct ChanNode *chan) { - struct ClientSocket *bot, *use_bot = NULL, *second_bot = NULL, *third_bot = NULL; - struct ChanUser *chanuser; - for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) { - if(bot->botid != BOTID) continue; - if((chanuser = getChanUser(bot->user, chan)) != NULL) { - if((chanuser->flags & CHANUSERFLAG_OPPED)) { - use_bot = bot; - if(bot->flags & SOCKET_FLAG_PREFERRED) break; - } else if(bot->flags & SOCKET_FLAG_PREFERRED) - second_bot = bot; - else - third_bot = bot; - } - } - if(!use_bot) use_bot = second_bot; - if(!use_bot) use_bot = third_bot; - return use_bot; + return getChannelBot(chan, BOTID); } static void neonserv_bot_ready(struct ClientSocket *client) { @@ -382,6 +367,10 @@ static void neonserv_trigger_callback(struct ChanNode *chan, char *trigger) { MYSQL_RES *res; MYSQL_ROW row; loadChannelSettings(chan); + if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) { + 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); res = mysql_use(); row = mysql_fetch_row(res); @@ -394,7 +383,7 @@ static void start_bots() { MYSQL_RES *res, *res2; MYSQL_ROW row; - printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID); + printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID); res = mysql_use(); while ((row = mysql_fetch_row(res)) != NULL) { @@ -405,6 +394,7 @@ static void start_bots() { user->flags |= USERFLAG_ISBOT; client = create_socket(row[3], atoi(row[4]), row[5], user); client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0); + client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0); client->botid = BOTID; client->clientid = atoi(row[7]); connect_socket(client); @@ -424,37 +414,6 @@ static void start_bots() { } } } - - //load all timed bans - printf_mysql_query("SELECT `ban_id`, `ban_timeout` FROM `bans` WHERE `ban_timeout` > 0"); - 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])); - } else { - //timed out - printf_mysql_query("DELETE FROM `bans` WHERE `ban_id` = '%s'", row[0]); - } - } -} - -TIMEQ_CALLBACK(channel_ban_timeout) { - char *str_banid = data; - MYSQL_RES *res; - MYSQL_ROW row; - printf_mysql_query("SELECT `ban_mask`, `channel_name` FROM `bans` LEFT JOIN `channels` ON `ban_channel` = `channel_id` WHERE `ban_id` = '%s'", str_banid); - res = mysql_use(); - struct ChanNode *chan; - if((row = mysql_fetch_row(res)) != NULL && (chan = getChanByName(row[1])) != NULL) { - struct ClientSocket *use_bot = getBotForChannel(chan); - if(use_bot) { - putsock(use_bot, "MODE %s -b %s", chan->name, row[0]); - } - printf_mysql_query("DELETE FROM `bans` WHERE `ban_id` = '%s'", str_banid); - } - free(str_banid); } void init_NeonServ() { @@ -517,7 +476,7 @@ void init_NeonServ() { #define OPER_COMMAND(NAME,FUNCTION,PARAMCOUNT,GACCESS,FLAGS) register_command(BOTID, NAME, FUNCTION, PARAMCOUNT, NULL, GACCESS, FLAGS) // NAME FUNCTION PARAMS ACCS FLAGS OPER_COMMAND("trace", neonserv_cmd_trace, 1, 400, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); - OPER_COMMAND("register", neonserv_cmd_register, 2, 200, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG); + OPER_COMMAND("register", neonserv_cmd_register, 1, 200, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG); OPER_COMMAND("unregister", neonserv_cmd_unregister,1, 200, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG); OPER_COMMAND("recover", neonserv_cmd_recover, 1, 200, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG); OPER_COMMAND("say", neonserv_cmd_say, 2, 600, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG); @@ -551,7 +510,7 @@ void init_NeonServ() { bind_part(neonserv_event_part); bind_quit(neonserv_event_quit); bind_chanctcp(neonserv_event_chanctcp); - bind_privctcp(neonserv_event_privctcp); + bind_privctcp(general_event_privctcp); bind_channotice(neonserv_event_channotice); bind_topic(neonserv_event_topic); bind_invite(neonserv_event_invite);