hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2144-empty-users' into 'develop'

Browse source 
User: Remote users don't need to be confirmed or approved

Closes #2144

See merge request pleroma/pleroma!3003
This commit is contained in:
rinpatch 2020-09-16 15:47:07 +00:00
commit 3a9baa9d0d
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/user.ex
View file

@ -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