moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user: harden auth_active?/1, superuser?/1, visible_for?/1

This commit is contained in:
William Pitcock 2019-01-09 06:21:21 +00:00
parent 4124c9aa4a
commit 2af67353c5
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/pleroma/user.ex
View File

@ -44,21 +44,28 @@ defmodule Pleroma.User do
timestamps() timestamps()
end end
def auth_active?(%User{} = user) do def auth_active?(%User{info: %User.Info{confirmation_pending: false}}), do: true
(user.info && !user.info.confirmation_pending) ||
!Pleroma.Config.get([:instance, :account_activation_required]) def auth_active?(%User{info: %User.Info{confirmation_pending: true}}),
end do: !Pleroma.Config.get([:instance, :account_activation_required])
def auth_active?(_), do: false
def remote_or_auth_active?(%User{local: false}), do: true def remote_or_auth_active?(%User{local: false}), do: true
def remote_or_auth_active?(%User{local: true} = user), do: auth_active?(user) def remote_or_auth_active?(%User{local: true} = user), do: auth_active?(user)
def visible_for?(%User{} = user, for_user \\ nil) do def visible_for?(user, for_user \\ nil)
User.remote_or_auth_active?(user) || (for_user && for_user.id == user.id) ||
User.superuser?(for_user) 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)
end end
def superuser?(nil), do: false def visible_for?(_, _), do: false
def superuser?(%User{} = user), do: user.info && User.Info.superuser?(user.info)
def superuser?(%User{info: %User.Info{} = info}), do: User.Info.superuser?(info)
def superuser?(_), do: false
def avatar_url(user) do def avatar_url(user) do
case user.avatar do case user.avatar do