X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fbots.c;h=1fe8cea4ff1b94aeefa6f218662d9cc0f220322d;hb=ee3a72eb4a412a0a504d070db1b41c6907f7604d;hp=9cc84d259f430fd881fde5f126220ccd2bbf45be;hpb=0b17bccd2d7fbef5652168d11d4f0af1f41252d3;p=NeonServV5.git

diff --git a/src/bots.c b/src/bots.c
index 9cc84d2..1fe8cea 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.4
+ * 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
@@ -26,11 +26,6 @@
 #include "modcmd.h"
 #include "DBHelper.h"
 
-#include "bot_NeonServ.h"
-#include "bot_NeonSpam.h"
-#include "bot_DummyServ.h"
-#include "bot_NeonHelp.h"
-
 struct cmd_bot_alias {
     int botid;
     char *alias;
@@ -56,7 +51,7 @@ static void start_zero_bots() {
         client->clientid = atoi(row[7]);
         connect_socket(client);
         
-        printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access` FROM `bot_binds` WHERE `botclass` = '0' AND `botid` = '%d'", client->clientid);
+        printf_mysql_query("SELECT `command`, `function`, `parameters`, `global_access`, `chan_access`, `flags` FROM `bot_binds` WHERE `botclass` = '0' AND `botid` = '%d'", client->clientid);
         res2 = mysql_use();
         while ((row = mysql_fetch_row(res2)) != NULL) {
             if(bind_botwise_cmd_to_command(0, client->clientid, row[0], row[1])) {
@@ -69,6 +64,8 @@ static void start_zero_bots() {
                 if(row[4]) {
                     bind_botwise_set_channel_access(0, client->clientid, row[0], row[4]);
                 }
+                if(strcmp(row[5], "0"))
+                    bind_botwise_set_bind_flags(0, client->clientid, row[0], atoi(row[5]));
             }
         }
         bind_botwise_unbound_required_functions(0, client->clientid);
@@ -85,7 +82,10 @@ 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
@@ -93,14 +93,9 @@ static void zero_bots_trigger_callback(int clientid, struct ChanNode *chan, char
 }
 
 void init_bots() {
-    init_NeonServ();
-    init_NeonSpam();
-    init_DummyServ();
-    init_NeonHelp();
-    
     set_bot_alias(0, "0");
     start_zero_bots();
-    set_trigger_callback(0, zero_bots_trigger_callback);
+    set_trigger_callback(0, 0, zero_bots_trigger_callback);
     
     MYSQL_RES *res;
     MYSQL_ROW row;
@@ -111,7 +106,7 @@ void init_bots() {
     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]);
@@ -119,20 +114,6 @@ void init_bots() {
     }
 }
 
-void loop_bots() {
-    loop_NeonServ();
-    loop_NeonSpam();
-    loop_DummyServ();
-    loop_NeonHelp();
-}
-
-void free_bots() {
-    free_NeonServ();
-    free_NeonSpam();
-    free_DummyServ();
-    free_NeonHelp();
-}
-
 struct ClientSocket *getChannelBot(struct ChanNode *chan, int botid) {
     struct ClientSocket *bot, *use_bot = NULL, *second_bot = NULL, *third_bot = NULL;
     struct ChanUser *chanuser;
@@ -154,20 +135,41 @@ 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, *userbot = NULL;
+    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);
+        }
+        if(bot->user == user) {
+            userbot = bot;
+        }
     }
 }