diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 23:09:53 +0100 |
| commit | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (patch) | |
| tree | a225407cb43edf3fa9d9ac0100021a380e11ff91 /app/models | |
| parent | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff) | |
| parent | 32418f0ff3e7f25ca67334585d6d8442b34cb4af (diff) | |
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index a90f43eda..744d66c8f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -516,11 +516,14 @@ class User < ApplicationRecord 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 |