Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unconfirmed accounts being registered as active users #23803

Merged
merged 2 commits into from Mar 6, 2023
Merged

Fix unconfirmed accounts being registered as active users #23803

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ecd6a0
Fix unconfirmed accounts being registered as active users
ClearlyClaire Feb 22, 2023
9d8b656
Make sure users are counted as active the moment they are approved an…
ClearlyClaire Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/models/user.rb
View file
Open in desktop
Expand Up @@ -507,11 +507,14 @@ def sanitize_role
def prepare_new_user!
BootstrapTimelineWorker.perform_async(account_id)
ActivityTracker.increment('activity:accounts:local')
ActivityTracker.record('activity:logins', id)
UserMailer.welcome(self).deliver_later
TriggerWebhookWorker.perform_async('account.approved', 'Account', account_id)
end

def prepare_returning_user!
return unless confirmed?

ActivityTracker.record('activity:logins', id)
regenerate_feed! if needs_feed_update?
end
Expand Down