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 3b92d2840f6cbffa15f9e8ada2bdf6220910baec..c8d61d2917a4fcb5a5db601f74d78860bc40f337 100644 (file)
--- a/src/IRCParser.c
+++ b/src/IRCParser.c
@@ -154,16 +154,16 @@ static IRC_CMD(raw_join) {
         user = addUserMask(from);
     }
     struct UserNode *registering, *last_registering = NULL, *next_registering;
-    int noEvent = 0;
+    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)
@@ -184,8 +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);
-        if(!noEvent)
+        if(!noEvent) {
+            if(wasRegistering)
+                user->flags |= USERFLAG_WAS_REGISTRING;
             event_join(chanuser);
+            if(wasRegistering)
+                user->flags &= ~USERFLAG_WAS_REGISTRING;
+        }
     }
     return 1;
 }