X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=event_neonserv_join.c;h=a117c18b0c7afa4145ea63a05c42c46a83864d6a;hb=795115bf680185ae01043bd1222b78bfed8c1d87;hp=d192fc3aef064620fbf8016cb75a673c7aaaa607;hpb=09cfeaae68073836fe62b4c7ba40afb847c80f4d;p=NeonServV5.git

diff --git a/event_neonserv_join.c b/event_neonserv_join.c
index d192fc3..a117c18 100644
--- a/event_neonserv_join.c
+++ b/event_neonserv_join.c
@@ -6,43 +6,43 @@ 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 TIMEQ_CALLBACK(neonserv_event_join_dynlimit);
 
-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;
+            putsock(client, "KICK %s %s :(%s) %s", chanuser->chan->name, chanuser->user->nick, (row[1] ? row[1] : client->user->nick), row[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) {
@@ -57,18 +57,120 @@ static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanU
     struct ClientSocket *textclient = ((client->flags & SOCKET_FLAG_PREFERRED) ? client : get_prefered_bot(client->botid));
     struct ChanNode *chan = chanuser->chan;
     struct UserNode *user = chanuser->user;
+    struct ModeBuffer *modeBuf;
     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, defaultrow = NULL;
+    printf_mysql_query("SELECT `channel_maxusers`, `channel_greeting`, `channel_usergreeting`, `channel_getop`, `channel_getvoice`, `channel_userinfo`, `channel_dynlimit` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) == NULL) return;
+    if(!row[3] || !row[4]) {
+        printf_mysql_query("SELECT `channel_getop`, `channel_getvoice`, `channel_userinfo` FROM `channels` WHERE `channel_name` = 'defaults'");
+        res = mysql_use();
+        defaultrow = mysql_fetch_row(res);
+    }
     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);
     }
+    if((user->flags & USERFLAG_ISAUTHED)) {
+        printf_mysql_query("SELECT `chanuser_access`, `chanuser_flags`, `chanuser_infoline`, `chanuser_seen`, `chanuser_id` FROM `chanusers` LEFT JOIN `users` ON `chanuser_uid` = `user_id` WHERE `chanuser_cid` = '%d' AND `user_user` = '%s'", chan->channel_id, escape_string(user->auth));
+        res = mysql_use();
+        chanuserrow = mysql_fetch_row(res);
+    } else
+        chanuserrow = NULL;
+    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[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
+    if(!(userflags & DB_CHANUSER_NOAUTOOP)) {
+        int getop = atoi((row[3] ? row[3] : defaultrow[0]));
+        int getvoice = atoi((row[4] ? row[4] : defaultrow[1]));
+        modeBuf = initModeBuffer(client, chan);
+        if(uaccess >= getop && uaccess != 0) { //we disallow auto op for all users
+            modeBufferOp(modeBuf, user->nick);
+        } else if(uaccess >= getvoice) {
+            modeBufferVoice(modeBuf, user->nick);
+        }
+        freeModeBuffer(modeBuf);
+    }
+    //INFOLINE
+    int userinfoaccess = atoi((row[5] ? row[5] : defaultrow[2]));
+    if(chanuserrow && strcmp(chanuserrow[2], "") && uaccess > userinfoaccess) {
+        if(!strcmp(chanuserrow[3], "0") || time(0) - atol(chanuserrow[3]) >= 30) {
+            putsock(client, "PRIVMSG %s :[%s] %s", chan->name, user->nick, chanuserrow[2]);
+        }
+    }
+    //SEEN
+    if(chanuserrow) {
+        printf_mysql_query("UPDATE `chanusers` SET `chanuser_seen` = UNIX_TIMESTAMP() WHERE `chanuser_id` = '%s'", chanuserrow[4]);
+    }
     //DYNLIMIT
+    if(row[6] && strcmp(row[6], "0")) {
+        char nameBuf[CHANNELLEN + 10];
+        sprintf(nameBuf, "dynlimit_%s", chan->name);
+        if(!timeq_name_exists(nameBuf)) {
+            //neonserv_event_join_dynlimit
+            timeq_add_name(nameBuf, 30, neonserv_event_join_dynlimit, strdup(chan->name));
+        }
+    }
     //AUTOINVITE
+    if(chanuserrow && !strcmp(chanuserrow[3], "0") && time(0) - atol(chanuserrow[3]) >= 30) {
+        //TODO: autoinvite
+    }
+}
+
+static TIMEQ_CALLBACK(neonserv_event_join_dynlimit) {
+    char *chanName = data;
+    struct ChanNode *chan = getChanByName(chanName);
+    free(chanName);
+    struct ClientSocket *client = getBotForChannel(chan);
+    if(!client) return;
+    loadChannelSettings(chan);
+    if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return;
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    printf_mysql_query("SELECT `channel_dynlimit` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) == NULL) return;
+    if(row[0] && strcmp(row[0], "0")) {
+        putsock(client, "MODE %s +l %d", chan->name, chan->usercount + atoi(row[0]));
+    }
 }