diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-16 15:47:07 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-16 15:47:07 +0000 |
| commit | 3a9baa9d0d68b7ded693321d8bc9bfabea5db896 (patch) | |
| tree | 5ea12c7223b5d8b7dbbd72a453218eb89143aede /lib | |
| parent | a4f80e1e741bc49d8d3eb185448a457308dda3ba (diff) | |
| parent | 7a88b726bf81e1610ade2b07ffd6af672b701600 (diff) | |
| download | pleroma-3a9baa9d0d68b7ded693321d8bc9bfabea5db896.tar.gz pleroma-3a9baa9d0d68b7ded693321d8bc9bfabea5db896.zip | |
Merge branch '2144-empty-users' into 'develop'
User: Remote users don't need to be confirmed or approved
Closes #2144
See merge request pleroma/pleroma!3003
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 57497eb83..1ffe60dfc 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -275,9 +275,9 @@ defmodule Pleroma.User do @spec account_status(User.t()) :: account_status() def account_status(%User{deactivated: true}), do: :deactivated def account_status(%User{password_reset_pending: true}), do: :password_reset_pending - def account_status(%User{approval_pending: true}), do: :approval_pending + def account_status(%User{local: true, approval_pending: true}), do: :approval_pending - def account_status(%User{confirmation_pending: true}) do + def account_status(%User{local: true, confirmation_pending: true}) do if Config.get([:instance, :account_activation_required]) do :confirmation_pending else |