NeonHelp: reinvite active requests when resetting the invite list

[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 12c357680e743877c8a4a35ad1812cc3ad85924d..9e3ba72dc3077236b7ab7ef901deee20935cdc99 100644 (file)
--- a/src/modules/NeonHelp.mod/bot_NeonHelp.c
+++ b/src/modules/NeonHelp.mod/bot_NeonHelp.c
@@ -399,7 +399,7 @@ static void neonhelp_event_chanmsg(struct UserNode *user, struct ChanNode *chan,
     }
 }
 
-static void destroy_support_request(struct ClientSocket *client, struct NeonHelpNode *helpnode, int do_reply) {
+void neonhelp_destroy_support_request(struct ClientSocket *client, struct NeonHelpNode *helpnode, int do_reply) {
     //write buffer to database
     char logbuff[MAXLEN * LOGBUFFERLINES];
     int len = 0;
@@ -421,6 +421,17 @@ static void destroy_support_request(struct ClientSocket *client, struct NeonHelp
     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;
@@ -447,12 +458,18 @@ static void neonhelp_event_kick(struct UserNode *user, struct ChanUser *target,
             support = getChanByName(row[0]);
             public = (row[1] ? getChanByName(row[1]) : NULL);
             if(target->chan == support || !((support && isUserOnChan(target->user, support)) || (public && isUserOnChan(target->user, public)))) {
+                if(helpnode->status == 1 && target->chan != support) {
+                    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)
                     prev_helpnode->next = helpnode->next;
                 else
                     client->botclass_helpnode = helpnode->next;
-                destroy_support_request(client, helpnode, 1);
+                neonhelp_destroy_support_request(client, helpnode, 1);
             }
         }
     }
@@ -484,12 +501,18 @@ static void neonhelp_event_part(struct ChanUser *target, char *reason) {
             support = getChanByName(row[0]);
             public = (row[1] ? getChanByName(row[1]) : NULL);
             if(target->chan == support || !((support && isUserOnChan(target->user, support)) || (public && isUserOnChan(target->user, public)))) {
+                if(helpnode->status == 1 && target->chan != support) {
+                    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)
                     prev_helpnode->next = helpnode->next;
                 else
                     client->botclass_helpnode = helpnode->next;
-                destroy_support_request(client, helpnode, 1);
+                neonhelp_destroy_support_request(client, helpnode, 1);
             }
         }
     }
@@ -517,7 +540,7 @@ static void neonhelp_event_quit(struct UserNode *target, char *reason) {
                 prev_helpnode->next = helpnode->next;
             else
                 client->botclass_helpnode = helpnode->next;
-            destroy_support_request(client, helpnode, 0);
+            neonhelp_destroy_support_request(client, helpnode, 0);
         }
     }
 }