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

[NeonServV5.git] / src / event_neonserv_join.c

diff --git a/src/event_neonserv_join.c b/src/event_neonserv_join.c
index 1a7493f544a30d4e041cc89f0845400fc5e1ef27..c2a8634099453800ca2cd197aeac6a416369b5e9 100644 (file)
--- a/src/event_neonserv_join.c
+++ b/src/event_neonserv_join.c
@@ -18,10 +18,11 @@
 struct neonserv_event_join_cache {
     struct ClientSocket *client;
     struct ChanUser *chanuser;
+    int was_registering;
 };
 
 static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup);
-static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser);
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering);
 static TIMEQ_CALLBACK(neonserv_event_join_dynlimit);
 
 static void neonserv_event_join(struct ChanUser *chanuser) {
@@ -56,20 +57,21 @@ static void neonserv_event_join(struct ChanUser *chanuser) {
         }
         cache->client = client;
         cache->chanuser = chanuser;
+        cache->was_registering = (user->flags & USERFLAG_WAS_REGISTRING);
         get_userauth(user, neonserv_event_join_nick_lookup, cache);
     } else
-        neonserv_event_join_async1(client, chanuser);
+        neonserv_event_join_async1(client, chanuser, (user->flags & USERFLAG_WAS_REGISTRING));
 }
 
 static USERAUTH_CALLBACK(neonserv_event_join_nick_lookup) {
     struct neonserv_event_join_cache *cache = data;
     if(user) {
-        neonserv_event_join_async1(cache->client, cache->chanuser);
+        neonserv_event_join_async1(cache->client, cache->chanuser, cache->was_registering);
     }
     free(cache);
 }
 
-static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser) {
+static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanUser *chanuser, int was_registering) {
     struct ClientSocket *textclient = ((client->flags & SOCKET_FLAG_PREFERRED) ? client : get_prefered_bot(client->botid));
     struct ChanNode *chan = chanuser->chan;
     struct UserNode *user = chanuser->user;
@@ -135,7 +137,7 @@ static void neonserv_event_join_async1(struct ClientSocket *client, struct ChanU
         if(a)
             b = a+2;
     } while(a);
-    if(greetingPos)
+    if(greetingPos && (!was_registering || *row[2]))
         reply(textclient, user, "[%s] %s", chan->name, greeting);
     //USER RIGHTS
     if(!(userflags & DB_CHANUSER_NOAUTOOP)) {