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

user: remove entirely redundant remote_or_auth_active?/1.

Browse source 
auth_active?/1 can check remote users and return true directly.
This commit is contained in:
William Pitcock 2019-01-09 06:36:50 +00:00
commit 74f48beec3
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/user_test.exs
View file

@ -768,16 +768,16 @@ defmodule Pleroma.UserTest do
end
end
test "remote_or_auth_active?/1 works correctly" do
test "auth_active?/1 works correctly" do
Pleroma.Config.put([:instance, :account_activation_required], true)
local_user = insert(:user, local: true, info: %{confirmation_pending: true})
confirmed_user = insert(:user, local: true, info: %{confirmation_pending: false})
remote_user = insert(:user, local: false)
refute User.remote_or_auth_active?(local_user)
assert User.remote_or_auth_active?(confirmed_user)
assert User.remote_or_auth_active?(remote_user)
refute User.auth_active?(local_user)
assert User.auth_active?(confirmed_user)
assert User.auth_active?(remote_user)
Pleroma.Config.put([:instance, :account_activation_required], false)
end