added bot/ircop mark to cmd_nicklist

[NeonServV5.git] / src / modules / NeonHelp.mod / bot_NeonHelp.c

diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.c b/src/modules/NeonHelp.mod/bot_NeonHelp.c
index 1b7fefa9a3a41edcf96a483232f2fbe26f11eff6..410ad1cf0229812a8149e8372d94c4be50302fd0 100644 (file)
--- a/src/modules/NeonHelp.mod/bot_NeonHelp.c
+++ b/src/modules/NeonHelp.mod/bot_NeonHelp.c
@@ -1,4 +1,4 @@
-/* bot_NeonHelp.c - NeonServ v5.4
+/* bot_NeonHelp.c - NeonServ v5.5
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -122,7 +122,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) {
@@ -130,6 +130,7 @@ 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 |= (strcmp(row[11], "0") ? SOCKET_FLAG_SECRET_BOT : 0);
             client->flags |= SOCKET_FLAG_SILENT;
             client->flags |= SOCKET_FLAG_REQUEST_INVITE | SOCKET_FLAG_REQUEST_OP;
             client->botid = BOTID;
@@ -421,6 +422,17 @@ void neonhelp_destroy_support_request(struct ClientSocket *client, struct NeonHe
     free(helpnode);
 }
 
+void neonhelp_invite_active_requests(struct ClientSocket *client, struct ChanNode *support, struct ChanNode *public, struct UserNode *ignore_user) {
+    struct NeonHelpNode *helpnode;
+    if(public && client->flags & SOCKET_HAVE_HELPNODE) {
+        for(helpnode = client->botclass_helpnode; helpnode; helpnode = helpnode->next) {
+            if(helpnode->status == 1 && helpnode->user != ignore_user && !isUserOnChan(helpnode->user, support)) {
+                putsock(client, "INVITE %s %s", helpnode->user->nick, support->name);
+            }
+        }
+    }
+}
+
 static void neonhelp_event_kick(struct UserNode *user, struct ChanUser *target, char *reason) {
     struct ClientSocket *client;
     MYSQL_RES *res;
@@ -451,6 +463,7 @@ static void neonhelp_event_kick(struct UserNode *user, struct ChanUser *target,
                     putsock(client, "MODE %s -i", support->name); //clear invite list
                     if(isModeSet(support->modes, 'i'))
                         putsock(client, "MODE %s +i", support->name);
+                    neonhelp_invite_active_requests(client, support, public, target->user);
                 }
                 //free the user's support request
                 if(prev_helpnode)
@@ -463,7 +476,7 @@ static void neonhelp_event_kick(struct UserNode *user, struct ChanUser *target,
     }
 }
 
-static void neonhelp_event_part(struct ChanUser *target, char *reason) {
+static void neonhelp_event_part(struct ChanUser *target, int quit, char *reason) {
     struct ClientSocket *client;
     MYSQL_RES *res;
     MYSQL_ROW row;
@@ -493,6 +506,7 @@ static void neonhelp_event_part(struct ChanUser *target, char *reason) {
                     putsock(client, "MODE %s -i", support->name); //clear invite list
                     if(isModeSet(support->modes, 'i'))
                         putsock(client, "MODE %s +i", support->name);
+                    neonhelp_invite_active_requests(client, support, public, target->user);
                 }
                 //free the user's support request
                 if(prev_helpnode)
@@ -505,33 +519,6 @@ static void neonhelp_event_part(struct ChanUser *target, char *reason) {
     }
 }
 
-static void neonhelp_event_quit(struct UserNode *target, char *reason) {
-    struct ClientSocket *client;
-    int userHasRequest;
-    for(client = getBots(SOCKET_FLAG_READY, NULL); client; client = getBots(SOCKET_FLAG_READY, client)) {
-        if(client->botid == BOTID) {
-            userHasRequest = 0;
-            struct NeonHelpNode *helpnode, *prev_helpnode = NULL;
-            if(client->flags & SOCKET_HAVE_HELPNODE) {
-                for(helpnode = client->botclass_helpnode; helpnode; helpnode = helpnode->next) {
-                    if(helpnode->user == target) {
-                        userHasRequest = 1;
-                        break;
-                    } else
-                        prev_helpnode = helpnode;
-                }
-            }
-            if(!userHasRequest) continue;
-            //free the user's support request
-            if(prev_helpnode)
-                prev_helpnode->next = helpnode->next;
-            else
-                client->botclass_helpnode = helpnode->next;
-            neonhelp_destroy_support_request(client, helpnode, 0);
-        }
-    }
-}
-
 static void neonhelp_event_invite(struct ClientSocket *client, struct UserNode *user, char *channel) {
        if(client->botid != BOTID)
                return;
@@ -574,7 +561,6 @@ void init_NeonHelp(int type) {
     bind_chanmsg(neonhelp_event_chanmsg, module_id);
     bind_part(neonhelp_event_part, module_id);
     bind_kick(neonhelp_event_kick, module_id);
-    bind_quit(neonhelp_event_quit, module_id);
        bind_invite(neonhelp_event_invite, module_id);
     
     set_trigger_callback(BOTID, module_id, neonhelp_trigger_callback);