hide default greeting & ignore join on joinflood-check if user rejoined the channel...

[NeonServV5.git] / src / IRCParser.c

diff --git a/src/IRCParser.c b/src/IRCParser.c
index b96acea7c0eb1bbcef943e8592c132e089e69377..c8d61d2917a4fcb5a5db601f74d78860bc40f337 100644 (file)
--- a/src/IRCParser.c
+++ b/src/IRCParser.c
@@ -1,4 +1,4 @@
-/* IRCParser.c - NeonServ v5.1
+/* IRCParser.c - NeonServ v5.2
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 #include "ModeNode.h"
 
 struct irc_cmd *irc_commands = NULL;
+static struct UserNode *registering_users = NULL;
 
 static void parse_line(struct ClientSocket *client, char *line);
 static void register_irc_function(char *command, irc_cmd_t *func);
@@ -152,6 +153,27 @@ static IRC_CMD(raw_join) {
     if(user == NULL) {
         user = addUserMask(from);
     }
+    struct UserNode *registering, *last_registering = NULL, *next_registering;
+    int noEvent = 0, wasRegistering = 0;
+    for(registering = registering_users; registering; registering = next_registering) {
+        next_registering = registering->next;
+        if(!strcmp(registering->nick, user->nick)) {
+            noEvent = event_registered(registering, user);
+            wasRegistering = 1;
+            if(last_registering)
+                last_registering->next = registering->next;
+            else
+                registering_users = registering->next;
+            delUser(registering, 1);
+        } else if(time(0) - registering->created > 2) {
+            if(last_registering)
+                last_registering->next = registering->next;
+            else
+                registering_users = registering->next;
+            delUser(registering, 1);
+        } else
+            last_registering = registering;
+    }
     if(chan == NULL) {
         chan = addChannel(argv[0]);
         //request member list
@@ -162,7 +184,13 @@ static IRC_CMD(raw_join) {
         putsock(client, "MODE %s +b", chan->name);
     } else if(!isUserOnChan(user, chan) && (chan->flags & CHANFLAG_RECEIVED_USERLIST)) {
         struct ChanUser *chanuser = addChanUser(chan, user);
-        event_join(chanuser);
+        if(!noEvent) {
+            if(wasRegistering)
+                user->flags |= USERFLAG_WAS_REGISTRING;
+            event_join(chanuser);
+            if(wasRegistering)
+                user->flags &= ~USERFLAG_WAS_REGISTRING;
+        }
     }
     return 1;
 }
@@ -215,7 +243,12 @@ static IRC_CMD(raw_quit) {
             }
         }
     }
-    delUser(user, 1); //now we fully free the user
+    if(!stricmp(argv[0], "Registered") && !(user->flags & USERFLAG_ISBOT)) {
+        user->next = registering_users;
+        user->created = time(0);
+        registering_users = user;
+    } else
+        delUser(user, 1); //now we fully free the user
     return 1;
 }