X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=blobdiff_plain;f=src%2Fmodules%2FNeonHelp.mod%2Fbot_NeonHelp.c;h=5d4aecb641b89381d5ee32f1c166447aa67feb73;hp=ac363007bdeb989d725bfa621a3e5ea008dce56f;hb=9826cc87d81d9adb6ca8819b46e7e83dcbb63020;hpb=d45311f417e3108b572425413b1da523c3817209 diff --git a/src/modules/NeonHelp.mod/bot_NeonHelp.c b/src/modules/NeonHelp.mod/bot_NeonHelp.c index ac36300..5d4aecb 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.6 * 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"}, @@ -118,7 +122,7 @@ static void start_bots(int type) { MYSQL_ROW row; if(type == MODSTATE_STARTSTOP) { - printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID); + printf_mysql_query("SELECT `nick`, `ident`, `realname`, `server`, `port`, `pass`, `textbot`, `id`, `queue`, `ssl`, `bind`, `secret` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1'", BOTID); res = mysql_use(); while ((row = mysql_fetch_row(res)) != NULL) { @@ -126,6 +130,7 @@ static void start_bots(int type) { client->flags |= (strcmp(row[6], "0") ? SOCKET_FLAG_PREFERRED : 0); client->flags |= (strcmp(row[8], "0") ? SOCKET_FLAG_USE_QUEUE : 0); client->flags |= (strcmp(row[9], "0") ? SOCKET_FLAG_SSL : 0); + client->flags |= (strcmp(row[11], "0") ? SOCKET_FLAG_SECRET_BOT : 0); client->flags |= SOCKET_FLAG_SILENT; client->flags |= SOCKET_FLAG_REQUEST_INVITE | SOCKET_FLAG_REQUEST_OP; client->botid = BOTID; @@ -198,6 +203,16 @@ static TIMEQ_CALLBACK(neonhelp_remind_open_requests); static void neonhelp_event_privmsg_async(struct ClientSocket *client, struct UserNode *user, struct UserNode *target, char *message) { MYSQL_RES *res; MYSQL_ROW row, row2; + char setting[128]; + sprintf(setting, "modules.%s.need_auth", get_module_name(module_id)); + if(get_int_field(setting) && !(user->flags & USERFLAG_ISAUTHED)) { + sprintf(setting, "modules.%s.need_auth_message", get_module_name(module_id)); + char *reply_message; + if(!(reply_message = get_string_field(setting))) + reply_message = get_language_string(user, "MODCMD_AUTH_REQUIRED"); + reply(client, user, "%s", reply_message); + return; + } printf_mysql_query("SELECT `helpserv_support`, `helpserv_public`, `helpserv_intern`, `helpserv_intern_announce` FROM `helpserv_settings` WHERE `helpserv_botid` = '%d'", client->clientid); res = mysql_use(); if (!(row = mysql_fetch_row(res))) return; @@ -395,7 +410,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 +432,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 +469,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,40 +512,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); } } } @@ -560,7 +571,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); @@ -568,10 +578,6 @@ void init_NeonHelp(int type) { register_default_language_table(msgtab); } -void loop_NeonHelp() { - -} - void free_NeonHelp(int type) { unbind_allcmd(BOTID); if(type == MODSTATE_STARTSTOP) {