From 19fc62cf3448ce044ca369c6cee81e1cb62022d8 Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 21 Sep 2011 15:41:29 +0200 Subject: [PATCH] continued event_join --- bot_NeonServ.c | 1 - event_neonserv_join.c | 68 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 14 deletions(-) diff --git a/bot_NeonServ.c b/bot_NeonServ.c index a85169b..aae4d9e 100644 --- a/bot_NeonServ.c +++ b/bot_NeonServ.c @@ -423,7 +423,6 @@ static TIMEQ_CALLBACK(channel_ban_timeout) { } void init_NeonServ() { - register_command(BOTID, "modes", neonserv_cmd_modes, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, NULL, 0); register_command(BOTID, "adduser", neonserv_cmd_adduser, 2, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_canadd", 0); register_command(BOTID, "deluser", neonserv_cmd_deluser, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH, "#channel_candel", 0); diff --git a/event_neonserv_join.c b/event_neonserv_join.c index d192fc3..3f6d5d3 100644 --- a/event_neonserv_join.c +++ b/event_neonserv_join.c @@ -7,42 +7,41 @@ struct neonserv_event_join_cache { static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup); static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser); -static int neonserv_event_join(struct ChanUser *chanuser) { +static void neonserv_event_join(struct ChanUser *chanuser) { struct UserNode *user = chanuser->user; struct ClientSocket *client = getBotForChannel(chanuser->chan); - if(!client) return 0; //we can't "see" this event + if(!client) return; //we can't "see" this event if(user->flags & USERFLAG_ISBOT) { - putsock("MODE %s +o %s", chanuser->chan->name, chanuser->user->nick); - return 0; + putsock(client, "MODE %s +o %s", chanuser->chan->name, chanuser->user->nick); + return; } - loadChannelSettings(chan); - if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return 0; + loadChannelSettings(chanuser->chan); + if(!(chanuser->chan->flags & CHANFLAG_CHAN_REGISTERED)) return; char *ban; char usermask[NICKLEN+USERLEN+HOSTLEN+3]; sprintf(usermask, "%s!%s@%s", user->nick, user->ident, user->host); if((ban = getBanAffectingMask(chanuser->chan, usermask)) != NULL && !(user->flags & (USERFLAG_ISBOT | USERFLAG_ISIRCOP))) { MYSQL_RES *res; MYSQL_ROW row; - printf_mysql_query("SELECT `ban_reason`, `user_user` FROM `bans` LEFT JOIN `users` ON `ban_owner` = `user_id` WHERE `ban_channel` = '%d' AND `ban_mask` = '%s'", chan->channel_id, escape_string(ban)); + printf_mysql_query("SELECT `ban_reason`, `user_user` FROM `bans` LEFT JOIN `users` ON `ban_owner` = `user_id` WHERE `ban_channel` = '%d' AND `ban_mask` = '%s'", chanuser->chan->channel_id, escape_string(ban)); res = mysql_use(); if ((row = mysql_fetch_row(res)) != NULL) { putsock(client, "MODE %s +b %s", chanuser->chan->name, ban); putsock(client, "KICK %s %s :(%s) %s", chanuser->chan->name, chanuser->user->nick, row[1], row[0]); - return 0; + return; } } if(!(user->flags & USERFLAG_ISAUTHED)) { struct neonserv_event_join_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); - return 0; + return; } cache->client = client; - cache->chanuser = chanuser + cache->chanuser = chanuser; get_userauth(user, neonserv_event_join_nick_lookup, cache); } else neonserv_event_join_async1(client, chanuser); - return 1; } static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup) { @@ -58,15 +57,58 @@ static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanU struct ChanNode *chan = chanuser->chan; struct UserNode *user = chanuser->user; MYSQL_RES *res; - MYSQL_ROW row; - printf_mysql_query("SELECT `channel_maxusers` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); + MYSQL_ROW row, chanuserrow; + printf_mysql_query("SELECT `channel_maxusers`, `channel_greeting`, `channel_usergreeting` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); res = mysql_use(); if ((row = mysql_fetch_row(res)) == NULL) return; if(chan->usercount > atoi(row[0])) { //update maxusers printf_mysql_query("UPDATE `channels` SET `channel_maxusers` = '%d' WHERE `channel_id` = '%d'", chan->usercount, chan->channel_id); } + printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags`, `chanuser_info` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); + res = mysql_use(); + chanuserrow = mysql_fetch_row(res); + int userflags = (chanuserrow ? atoi(chanuserrow[1]) : 0); + int uaccess = ((chanuserrow && !(userflags & DB_CHANUSER_SUSPENDED)) ? atoi(chanuserrow[0]) : 0); //GREETING + char greeting[MAXLEN]; + int greetingPos = 0; + char *a, *b = (chanuserrow ? row[2] : row[1]); + do { + if(!b) break; + a = strstr(b, "$"); + if(a) *a = '\0'; + greetingPos += sprintf(greeting + greetingPos, "%s", b); + if(!a) break; + switch(a[1]) { + case '\0': + a = NULL; + break; + case 'A': + greetingPos += sprintf(greeting + greetingPos, "%d", uaccess); + break; + case 'B': + greetingPos += sprintf(greeting + greetingPos, "%s", client->user->nick); + break; + case 'N': + greetingPos += sprintf(greeting + greetingPos, "%s", user->nick); + break; + case 'H': + greetingPos += sprintf(greeting + greetingPos, "%s@%s", user->ident, user->host); + break; + case 'U': + greetingPos += sprintf(greeting + greetingPos, "%s", ((user->flags & USERFLAG_ISAUTHED) ? user->auth : "*")); + break; + default: + greeting[greetingPos++] = '$'; + greeting[greetingPos++] = a[1]; + break; + } + if(a) + b = a+2; + } while(a); + if(greetingPos) + reply(textclient, user, "[%s] %s", chan->name, greeting); //USER RIGHTS //INFOLINE / SEEN //DYNLIMIT -- 2.20.1