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

7
lib/pleroma/user.ex
View file

@ -44,6 +44,8 @@ defmodule Pleroma.User do
timestamps()
end
def auth_active?(%User{local: false}), do: false
def auth_active?(%User{info: %User.Info{confirmation_pending: false}}), do: true
def auth_active?(%User{info: %User.Info{confirmation_pending: true}}),
@ -51,15 +53,12 @@ defmodule Pleroma.User do
def auth_active?(_), do: false
def remote_or_auth_active?(%User{local: false}), do: true
def remote_or_auth_active?(%User{local: true} = user), do: auth_active?(user)
def visible_for?(user, for_user \\ nil)
def visible_for?(%User{id: user_id}, %User{id: for_id}) when user_id == for_id, do: true
def visible_for?(%User{} = user, for_user) do
remote_or_auth_active?(user) || superuser?(for_user)
auth_active?(user) || superuser?(for_user)
end
def visible_for?(_, _), do: false