From e480c2dd1f27977ec0d5b0f2730d3eeaf5984f92 Mon Sep 17 00:00:00 2001 From: pk910 Date: Thu, 2 Aug 2012 13:09:09 +0200 Subject: [PATCH] reset invite list when a request gets closed --- src/modules/NeonHelp.mod/bot_NeonHelp.c | 18 +++++++--- src/modules/NeonHelp.mod/bot_NeonHelp.h | 9 ++++- .../NeonHelp.mod/cmd_neonhelp_delete.c | 34 +++++++++++++------ 3 files changed, 45 insertions(+), 16 deletions(-) diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.c b/src/modules/NeonHelp.mod/bot_NeonHelp.c index 12c3576..1b7fefa 100644 --- 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; @@ -447,12 +447,17 @@ 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); + } //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 +489,17 @@ 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); + } //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 +527,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); } } } diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.h b/src/modules/NeonHelp.mod/bot_NeonHelp.h index b4714aa..e28a2de 100644 --- a/src/modules/NeonHelp.mod/bot_NeonHelp.h +++ b/src/modules/NeonHelp.mod/bot_NeonHelp.h @@ -28,8 +28,13 @@ struct UserNode; struct ChanNode; +struct NeonHelpNodeUser { + struct UserNode *user; + struct NeonHelpNodeUser *next; +}; + struct NeonHelpNode { - struct UserNode *user; + struct NeonHelpNodeUser *user; int suppid; char status:6; char announce:2; @@ -42,4 +47,6 @@ void init_NeonHelp(int type); void loop_NeonHelp(); void free_NeonHelp(int type); +void neonhelp_destroy_support_request(struct ClientSocket *client, struct NeonHelpNode *helpnode, int do_reply); + #endif \ No newline at end of file diff --git a/src/modules/NeonHelp.mod/cmd_neonhelp_delete.c b/src/modules/NeonHelp.mod/cmd_neonhelp_delete.c index 5f26430..2cf57a4 100644 --- a/src/modules/NeonHelp.mod/cmd_neonhelp_delete.c +++ b/src/modules/NeonHelp.mod/cmd_neonhelp_delete.c @@ -60,24 +60,36 @@ CMD_BIND(neonhelp_cmd_delete) { reply(textclient, user, "NH_NEXT_NONE"); return; } - struct NeonHelpNode *helpnode, *next_helpnode = NULL, *prev_helpnode = NULL; + struct NeonHelpNode *helpnode, *prev_helpnode = NULL; for(helpnode = client->botclass_helpnode; helpnode; helpnode = helpnode->next) { - if(atoi(argv[0]) == helpnode->suppid) { - next_helpnode = helpnode; + if(atoi(argv[0]) == helpnode->suppid) break; - } else + else prev_helpnode = helpnode; } - if(!next_helpnode) { + if(!helpnode) { reply(textclient, user, "NH_NEXT_NOT_FOUND"); return; } - reply(client, next_helpnode->user, "NH_DELETED", next_helpnode->suppid); - printf_mysql_query("UPDATE `helpserv_requests` SET `status` = '2' WHERE `id` = '%d'", next_helpnode->suppid); + if(helpnode->status == 1) { + struct ChanNode *support, *public; + support = getChanByName(row[0]); + public = (row[1] ? getChanByName(row[1]) : NULL); + if(isUserOnChan(helpnode->user, support)) { + if(public) + putsock(client, "KICK %s %s :your request has been closed", support->name, helpnode->user->nick); + else + putsock(client, "MODE %s -v %s", support->name, helpnode->user->nick); + } else { + putsock(client, "MODE %s -i", support->name); //clear invite list + if(isModeSet(support->modes, 'i')) + putsock(client, "MODE %s +i", support->name); + } + } if(prev_helpnode) - prev_helpnode->next = next_helpnode->next; + prev_helpnode->next = helpnode->next; else - client->botclass_helpnode = next_helpnode->next; - reply(textclient, user, "NH_DELETED_STAFF", next_helpnode->suppid, next_helpnode->user->nick); - free(next_helpnode); + client->botclass_helpnode = helpnode->next; + reply(textclient, user, "NH_DELETED_STAFF", helpnode->suppid, helpnode->user->nick); + neonhelp_neonhelp_destroy_support_request(client, helpnode, 1); } -- 2.20.1