X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonHelp.mod%2Fbot_NeonHelp.c;h=9e3ba72dc3077236b7ab7ef901deee20935cdc99;hb=30858881bbcaad3c1cdd895e2e3f7b554d5f67c5;hp=07b6a975ecbc684117534b401fa9040d085e1cf4;hpb=9f27add1dff4dfa36fb65d43805da1939fbe4a4b;p=NeonServV5.git

diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.c b/src/modules/NeonHelp.mod/bot_NeonHelp.c
index 07b6a97..9e3ba72 100644
--- 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"},
@@ -127,7 +131,7 @@ static void start_bots(int type) {
             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_SILENT;
-            client->flags |= SOCKET_FLAG_REQUEST_INVITE;
+            client->flags |= SOCKET_FLAG_REQUEST_INVITE | SOCKET_FLAG_REQUEST_OP;
             client->botid = BOTID;
             client->clientid = atoi(row[7]);
             connect_socket(client);
@@ -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,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);
             }
         }
     }
@@ -480,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);
             }
         }
     }
@@ -513,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);
         }
     }
 }