X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fbots.c;h=693901df990f4cca627a325c77f5cc425254e8fb;hp=ef55ef656e1b78b4a3c4c7c9255f647496559e80;hb=4812835346f724fcea86e78f741cc6c72c86b676;hpb=02e797baca7f15e306d70b3b7e2b4d83ff1cf44f

diff --git a/src/bots.c b/src/bots.c
index ef55ef6..693901d 100644
--- a/src/bots.c
+++ b/src/bots.c
@@ -1,4 +1,4 @@
-/* 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
@@ -117,16 +117,11 @@ static void zero_bots_bot_ready(struct ClientSocket *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) {
@@ -138,6 +133,17 @@ void init_bots() {
             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) {
@@ -145,8 +151,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)
@@ -184,7 +190,7 @@ void requestOp(struct UserNode *user, struct ChanNode *chan) {
 }
 
 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;
@@ -193,9 +199,6 @@ void requestInvite(struct UserNode *user, struct ChanNode *chan) {
             invited = 1;
             putsock(bot, "INVITE %s %s", user->nick, chan->name);
         }
-        if(bot->user == user) {
-            userbot = bot;
-        }
     }
 }