stefan230/akkoma
1
0
Fork 0
forked from YokaiRick/akkoma
Code Pull requests Activity

Special handling for unconfirmed users based on instance config no longer needed.

Browse source
This commit is contained in:
Mark Felder 2021-01-20 11:14:15 -06:00
parent e759579f97
commit 704eef3c2d
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/user.ex
View file

@ -289,15 +289,7 @@ def binary_id(%User{} = user), do: binary_id(user.id)
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) ::