diff options
| author | Mark Felder <feld@feld.me> | 2021-01-20 11:14:15 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-20 11:14:15 -0600 |
| commit | 704eef3c2d29c92316f4860c50982512824dd514 (patch) | |
| tree | 32c044da4e37ba39a557513564c4c44e04cc6c0d | |
| parent | e759579f9749ac4198054ddab2d3bb77cc5f04ae (diff) | |
| download | pleroma-704eef3c2d29c92316f4860c50982512824dd514.tar.gz | |
Special handling for unconfirmed users based on instance config no longer needed.
| -rw-r--r-- | lib/pleroma/user.ex | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index d81abbd2b..2aeacf816 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -289,15 +289,7 @@ defmodule Pleroma.User do def account_status(%User{deactivated: true}), do: :deactivated def account_status(%User{password_reset_pending: true}), do: :password_reset_pending def account_status(%User{local: true, is_approved: false}), do: :approval_pending - - def account_status(%User{local: true, is_confirmed: false}) do - if Config.get([:instance, :account_activation_required]) do - :confirmation_pending - else - :active - end - end - + def account_status(%User{local: true, is_confirmed: false}), do: :confirmation_pending def account_status(%User{}), do: :active @spec visible_for(User.t(), User.t() | nil) :: |