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

Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations

Browse source
This commit is contained in:
Ivan Tashkinov 2019-11-15 21:40:14 +03:00
commit 01d9c093c3
73 changed files with 3612 additions and 445 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/user.ex
View file

@ -139,6 +139,9 @@ defmodule Pleroma.User do
timestamps()
end
@doc "Returns if the user should be allowed to authenticate"
def auth_active?(%User{deactivated: true}), do: false
def auth_active?(%User{confirmation_pending: true}),
do: !Pleroma.Config.get([:instance, :account_activation_required])