added basic NeonSpam code (no functions)

[NeonServV5.git] / src / bot_NeonServ.c

diff --git a/src/bot_NeonServ.c b/src/bot_NeonServ.c
index 5336737b181a1d88d8a404e386fb31c62db99c98..2f449e7f7330be9e9e8c5ee32ab70951cd9808dd 100644 (file)
--- a/src/bot_NeonServ.c
+++ b/src/bot_NeonServ.c
@@ -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) {
@@ -424,37 +409,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() {