diff options
| author | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
| commit | 537ba1c5e07a33692ed63ca50b50e240efce6f88 (patch) | |
| tree | 2a364998d729d1f65d5b87b5703604ac8d163678 /lib/pleroma/user.ex | |
| parent | 28581e03ad5761aa484a7fa427be8ab5695f0892 (diff) | |
| parent | 0a6f5f479348eff5f5404d4455fcb8254809812f (diff) | |
| download | pleroma-537ba1c5e07a33692ed63ca50b50e240efce6f88.tar.gz | |
Merge branch 'develop' into refactor/deactivated_user_field
Diffstat (limited to 'lib/pleroma/user.ex')
| -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 b27923975..e422b59f1 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -290,15 +290,7 @@ defmodule Pleroma.User do def account_status(%User{is_active: false}), 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) :: |