*** VERSION 5.6.0 ***

[NeonServV5.git] / src / modules / NeonBackup.mod / bot_NeonBackup.c

diff --git a/src/modules/NeonBackup.mod/bot_NeonBackup.c b/src/modules/NeonBackup.mod/bot_NeonBackup.c
index 916e3b27fcbd07b416ffd95f1e81a47b1a939788..a886da3697cef4e5d35f722088d6aff480286235 100644 (file)
--- a/src/modules/NeonBackup.mod/bot_NeonBackup.c
+++ b/src/modules/NeonBackup.mod/bot_NeonBackup.c
@@ -1,4 +1,4 @@
-/* bot_NeonBackup.c - NeonServ v5.4
+/* bot_NeonBackup.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -40,6 +40,8 @@ static const struct default_language_entry msgtab[] = {
 };
 
 static void neonbackup_bot_ready(struct ClientSocket *client) {
+    if(client->botid != BOTID)
+        return;
     MYSQL_RES *res;
     MYSQL_ROW row;
     
@@ -86,7 +88,7 @@ static void start_bots(int type) {
     MYSQL_ROW row;
     
     if(type == MODSTATE_STARTSTOP) {
-        printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
+        printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind`, `secret` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID);
         res = mysql_use();
         
         while ((row = mysql_fetch_row(res)) != NULL) {
@@ -94,7 +96,8 @@ static void start_bots(int type) {
             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 |= SOCKET_FLAG_REQUEST_INVITE;
+            client->flags |= (strcmp(row[11], "0") ? SOCKET_FLAG_SECRET_BOT : 0);
+            client->flags |= SOCKET_FLAG_REQUEST_INVITE | SOCKET_FLAG_REQUEST_OP;
             client->botid = BOTID;
             client->clientid = atoi(row[7]);
             connect_socket(client);
@@ -122,7 +125,26 @@ static void start_bots(int type) {
 }
 
 void neonbackup_recover_chan(struct ChanNode *chan) {
-    
+    struct ClientSocket *bot = getChannelBot(chan, BOTID); // prefer backup bot ;)
+    struct ChanUser *chanuser = (bot ? getChanUser(bot->user, chan) : NULL);
+    if(!chanuser || !(chanuser->flags & CHANUSERFLAG_OPPED)) {
+        //search an opped bot
+        for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+            if((chanuser = getChanUser(bot->user, chan)) && (chanuser->flags & CHANUSERFLAG_OPPED))
+                break;
+        }
+    }
+    if(!bot) //no opped bots present... channel can't be recovered
+        return;
+    struct ClientSocket *target;
+    struct ModeBuffer *modeBuf;
+    modeBuf = initModeBuffer(bot, chan);
+    for(target = getBots(SOCKET_FLAG_READY, NULL); target; target = getBots(SOCKET_FLAG_READY, target)) {
+        if((target->flags & SOCKET_FLAG_REQUEST_OP) && (chanuser = getChanUser(target->user, chan)) && !(chanuser->flags & CHANUSERFLAG_OPPED)) {
+            modeBufferOp(modeBuf, target->user->nick);
+        }
+    }
+    freeModeBuffer(modeBuf);
 }
 
 static void neonbackup_event_join(struct ChanUser *chanuser) {
@@ -180,10 +202,6 @@ void init_NeonBackup(int type) {
     register_default_language_table(msgtab);
 }
 
-void loop_NeonBackup() {
-    
-}
-
 void free_NeonBackup(int type) {
     unbind_allcmd(BOTID);
     if(type == MODSTATE_STARTSTOP) {