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

diff --git a/src/bots.c b/src/bots.c
index 7ada743..693901d 100644
--- a/src/bots.c
+++ b/src/bots.c
@@ -1,4 +1,4 @@
-/* bots.c - NeonServ v5.4
+/* bots.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include "version.h"
 #include "modcmd.h"
 #include "DBHelper.h"
+#include "IRCEvents.h"
 
 struct cmd_bot_alias {
     int botid;
@@ -39,7 +40,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) {
@@ -47,6 +48,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);
@@ -92,15 +94,34 @@ static void zero_bots_trigger_callback(int clientid, struct ChanNode *chan, char
         strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "+"));
 }
 
-void init_bots() {
-    set_bot_alias(0, "0");
-    start_zero_bots();
-    set_trigger_callback(0, 0, zero_bots_trigger_callback);
+static void zero_bots_bot_ready(struct ClientSocket *client) {
+    if(client->botid != 0)
+        return;
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    
+    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) {
@@ -112,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) {
@@ -119,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)
@@ -157,6 +189,19 @@ void requestOp(struct UserNode *user, struct ChanNode *chan) {
     }
 }
 
+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);
+        }
+    }
+}
+
 TIMEQ_CALLBACK(channel_ban_timeout) {
     char *str_banid = data;
     MYSQL_RES *res;