Fix unconfirmed accounts being registered as active users #23803
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gargron
requested changes
Mar 3, 2023
app/models/user.rb
Outdated
| UserMailer.welcome(self).deliver_later | ||
| TriggerWebhookWorker.perform_async('account.approved', 'Account', account_id) | ||
| end | ||
|
|
||
| def prepare_returning_user! | ||
| ActivityTracker.record('activity:logins', id) | ||
| ActivityTracker.record('activity:logins', id) if confirmed? |
There was a problem hiding this comment.
We don't need to execute this entire method if neither confirmed? nor approved? are true.
There was a problem hiding this comment.
I changed it for a guard clause, but I'm uncomfortable with changing the behavior further wrt. approved?.
ClearlyClaire
force-pushed
the
fixes/unconfirmed-active-users
branch
from
ff81470
to
9d8b656
Compare
Gargron
approved these changes
Mar 6, 2023
ClearlyClaire
added a commit
that referenced
this pull request
Mar 14, 2023
ClearlyClaire
added a commit
to ClearlyClaire/mastodon
that referenced
this pull request
Mar 14, 2023
ClearlyClaire
added a commit
that referenced
this pull request
Mar 16, 2023
noellabo
pushed a commit
to fedibird/mastodon
that referenced
this pull request
Mar 17, 2023
rutvijmehta-harness
pushed a commit
to rutvijmehta-harness/mastodon
that referenced
this pull request
Mar 19, 2023
rutvijmehta-harness
added a commit
to rutvijmehta-harness/mastodon
that referenced
this pull request
Mar 19, 2023
arachnist
pushed a commit
to arachnist/mastodon
that referenced
this pull request
Apr 4, 2023
Roboron3042
pushed a commit
to Roboron3042/mastodon
that referenced
this pull request
Apr 16, 2023
noellabo
pushed a commit
to fedibird/mastodon
that referenced
this pull request
Apr 22, 2023
skerit
pushed a commit
to 11ways/mastodon
that referenced
this pull request
Jul 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The total user count is the total of users who have confirmed their email address, but the active user count also includes users who have not.
Note that confirmed but not-approved users remain part of the total user count and may be considered as active as well. Maybe we should change that too.