X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonHelp.mod%2Fbot_NeonHelp.c;h=5aa23163ca6db3097c4719fbed4300bd523925ce;hb=78e040af3fcc36ab684611c0f98b4381ff420878;hp=68cf6626013bb3bb7bd07e54e86afdda32a675aa;hpb=ee3a72eb4a412a0a504d070db1b41c6907f7604d;p=NeonServV5.git diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.c b/src/modules/NeonHelp.mod/bot_NeonHelp.c index 68cf662..5aa2316 100644 --- 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 @@ -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"}, @@ -70,6 +74,8 @@ static const struct default_language_entry msgtab[] = { }; static void neonhelp_bot_ready(struct ClientSocket *client) { + if(client->botid != BOTID) + return; MYSQL_RES *res; MYSQL_ROW row; @@ -125,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); @@ -393,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; @@ -415,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; @@ -441,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; @@ -478,40 +501,19 @@ 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); - } - } - } -} - -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; - } + neonhelp_destroy_support_request(client, helpnode, 1); } - 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); } } } @@ -558,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);