gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Fix Style/GuardClause in User#wrap_email_confirmation (#35524)

Browse Source
This commit is contained in:
Matt Jankowski 2025-07-28 04:52:59 -04:00 committed by GitHub
parent 86ef4d4884
commit 916cc1365e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/models/user.rb
View File

@ -466,16 +466,17 @@ class User < ApplicationRecord
yield
if new_user
# Avoid extremely unlikely race condition when approving and confirming
# the user at the same time
reload unless approved?
after_confirmation_tasks if new_user
end
if approved?
prepare_new_user!
else
notify_staff_about_pending_account!
end
def after_confirmation_tasks
# Handle condition when approving and confirming a user at the same time
reload unless approved?
if approved?
prepare_new_user!
else
notify_staff_about_pending_account!
end
end