From e098be6d282025fe0b073e47648288580cbbf4bc Mon Sep 17 00:00:00 2001 From: Bram Matthys Date: Sun, 11 Feb 2024 10:34:14 +0100 Subject: [PATCH] Some more moving for previous commit aa9fdd352a336cab6c56ea615712e5bf5d6c5045 --- src/modules/nick.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/nick.c b/src/modules/nick.c index 04b420763..77fe6f284 100644 --- a/src/modules/nick.c +++ b/src/modules/nick.c @@ -837,9 +837,6 @@ void welcome_user(Client *client, TKL *viruschan_tkl) if (client->umodes & UMODE_INVISIBLE) irccounts.invisible++; - /* set::modes-on-connect */ - client->umodes |= get_setting_for_user_number(client, SET_MODES_ON_CONNECT); - build_umode_string(client, 0, SEND_UMODES|UMODE_SERVNOTICE, buf); sendto_serv_butone_nickcmd(client->direction, NULL, client, (*buf == '\0' ? "+" : buf)); @@ -1088,8 +1085,13 @@ int _register_user(Client *client) break; } + /* User is going to be accepted -- don't reject the user anymore under this line! */ + SetUser(client); + /* set::modes-on-connect - needs to be here for account-based custom set settings (PR #270) */ + client->umodes |= get_setting_for_user_number(client, SET_MODES_ON_CONNECT); + make_cloakedhost(client, client->user->realhost, client->user->cloakedhost, sizeof(client->user->cloakedhost)); /* client->user->virthost should never be empty */