From 9312ddbb7b17b7ab331b30f79197a4b227ead5c4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 27 Oct 2025 08:51:50 +0100 Subject: [PATCH] Reset the anonimity. --- app/Handlers/Events/UserEventHandler.php | 43 ++++++++++++------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index 1971dd0ade..4fd0becf8e 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -91,8 +91,8 @@ class UserEventHandler $repository = app(UserRepositoryInterface::class); /** @var User $user */ - $user = $event->user; - $count = $repository->count(); + $user = $event->user; + $count = $repository->count(); // only act when there is 1 user in the system and he has no admin rights. if (1 === $count && !$repository->hasRole($user, 'owner')) { @@ -124,13 +124,13 @@ class UserEventHandler */ public function createGroupMembership(RegisteredUser $event): void { - $user = $event->user; - $groupExists = true; - $groupTitle = $user->email; - $index = 1; + $user = $event->user; + $groupExists = true; + $groupTitle = $user->email; + $index = 1; /** @var null|UserGroup $group */ - $group = null; + $group = null; // create a new group. while (true === $groupExists) { // @phpstan-ignore-line @@ -140,7 +140,7 @@ class UserEventHandler break; } - $groupTitle = sprintf('%s-%d', $user->email, $index); + $groupTitle = sprintf('%s-%d', $user->email, $index); ++$index; if ($index > 99) { throw new FireflyException('Email address can no longer be used for registrations.'); @@ -148,7 +148,7 @@ class UserEventHandler } /** @var null|UserRole $role */ - $role = UserRole::where('title', UserRoleEnum::OWNER->value)->first(); + $role = UserRole::where('title', UserRoleEnum::OWNER->value)->first(); if (null === $role) { throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?'); } @@ -172,11 +172,12 @@ class UserEventHandler $repository = app(UserRepositoryInterface::class); /** @var User $user */ - $user = $event->user; + $user = $event->user; if ($repository->hasRole($user, 'demo')) { // set user back to English. Preferences::setForUser($user, 'language', 'en_US'); Preferences::setForUser($user, 'locale', 'equal'); + Preferences::setForUser($user, 'anonymous', false); Preferences::mark(); } } @@ -223,7 +224,7 @@ class UserEventHandler public function sendAdminRegistrationNotification(RegisteredUser $event): void { - $sendMail = (bool) app('fireflyconfig')->get('notification_admin_new_reg', true)->data; + $sendMail = (bool)app('fireflyconfig')->get('notification_admin_new_reg', true)->data; if ($sendMail) { $owner = $event->owner; @@ -283,7 +284,7 @@ class UserEventHandler $oldEmail = $event->oldEmail; $user = $event->user; $token = Preferences::getForUser($user, 'email_change_undo_token', 'invalid'); - $hashed = hash('sha256', sprintf('%s%s', (string) config('app.key'), $oldEmail)); + $hashed = hash('sha256', sprintf('%s%s', (string)config('app.key'), $oldEmail)); $url = route('profile.undo-email-change', [$token->data, $hashed]); try { @@ -366,7 +367,7 @@ class UserEventHandler */ public function sendRegistrationMail(RegisteredUser $event): void { - $sendMail = (bool) app('fireflyconfig')->get('notification_user_new_reg', true)->data; + $sendMail = (bool)app('fireflyconfig')->get('notification_user_new_reg', true)->data; if ($sendMail) { try { Notification::send($event->user, new UserRegistrationNotification()); @@ -406,10 +407,10 @@ class UserEventHandler break; - // case 'ntfy': - // $class = UserTestNotificationNtfy::class; - // - // break; + // case 'ntfy': + // $class = UserTestNotificationNtfy::class; + // + // break; case 'pushover': $class = UserTestNotificationPushover::class; @@ -446,7 +447,7 @@ class UserEventHandler public function storeUserIPAddress(ActuallyLoggedIn $event): void { app('log')->debug('Now in storeUserIPAddress'); - $user = $event->user; + $user = $event->user; if ($user->hasRole('demo')) { app('log')->debug('Do not log demo user logins'); @@ -463,8 +464,8 @@ class UserEventHandler return; } - $inArray = false; - $ip = request()->ip(); + $inArray = false; + $ip = request()->ip(); app('log')->debug(sprintf('User logging in from IP address %s', $ip)); // update array if in array @@ -492,7 +493,7 @@ class UserEventHandler $preference = array_values($preference); /** @var bool $send */ - $send = Preferences::getForUser($user, 'notification_user_login', true)->data; + $send = Preferences::getForUser($user, 'notification_user_login', true)->data; Preferences::setForUser($user, 'login_ip_history', $preference); if (false === $inArray && true === $send) {