rearranged NeonServ code to be modular

[NeonServV5.git] / src / bots.c

diff --git a/src/bots.c b/src/bots.c
index e22b768bde400c72a3c0fd090d2ed04bc52bf7b8..994dbbac5d0153ac8db931ab105c1b3e00a4248e 100644 (file)
--- a/src/bots.c
+++ b/src/bots.c
@@ -1,5 +1,5 @@
 /* bots.c - NeonServ v5.3
- * Copyright (C) 2011  Philipp Kreil (pk910)
+ * 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
@@ -56,7 +56,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 +69,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);
@@ -83,18 +85,19 @@ static void zero_bots_trigger_callback(int clientid, struct ChanNode *chan, char
         strcpy(trigger, "+");
         return;
     }
-    printf_mysql_query("SELECT `trigger` FROM `bot_channels` LEFT JOIN `bots` ON `botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chan->channel_id, clientid);
+    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);
-    strcpy(trigger, (strlen(row[0]) ? row[0] : "+"));
+    if(!(row = mysql_fetch_row(res))) {
+        strcpy(trigger, "");
+        return;
+    }
+    if(row[0] && *row[0])
+        strcpy(trigger, row[0]);
+    else
+        strcpy(trigger, ((row[1] && *row[1]) ? row[1] : "+"));
 }
 
 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);
@@ -116,20 +119,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;