rewrote IRC cache parser to be (hopefully) more stable

[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 ac363007bdeb989d725bfa621a3e5ea008dce56f..9d29a50d50bee6a6fd71ef426932d9e123fe0bfc 100644 (file)
--- a/src/modules/NeonHelp.mod/bot_NeonHelp.c
+++ b/src/modules/NeonHelp.mod/bot_NeonHelp.c
@@ -58,9 +58,13 @@ static const struct default_language_entry msgtab[] = {
     {"NH_REQUESTS_HEADER_STATUS", "State"},
     {"NH_REQUESTS_HEADER_NICK", "Nick"},
     {"NH_REQUESTS_HEADER_TIME", "Time"},
+    {"NH_REQUESTS_HEADER_STATUS", "State"},
+    {"NH_REQUESTS_HEADER_AUTH", "Auth"},
+    {"NH_REQUESTS_HEADER_MASK", "Mask"},
     {"NH_REQUESTS_HEADER_REQUEST", "Question"},
     {"NH_REQUESTS_STATE_ACTIVE", "active"},
     {"NH_REQUESTS_STATE_PENDING", "pending"},
+    {"NH_REQUESTS_STATE_CLOSED", "closed"},
     {"NH_REQUESTS_STATE_ERROR", "ERROR"},
     {"NH_STATS_HEADER_USER", "User"},
     {"NH_STATS_HEADER_LAST_24H", "last 24h"},
@@ -395,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;
@@ -417,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;
@@ -443,18 +458,24 @@ 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);
             }
         }
     }
 }
 
-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;
@@ -480,44 +501,23 @@ 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);
             }
         }
     }
 }
 
-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;
-            destroy_support_request(client, helpnode, 0);
-        }
-    }
-}
-
 static void neonhelp_event_invite(struct ClientSocket *client, struct UserNode *user, char *channel) {
        if(client->botid != BOTID)
                return;
@@ -560,7 +560,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);