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

[#471] Factored out User.visible_for?/2.

Browse source
This commit is contained in:
Ivan Tashkinov 2018-12-28 14:35:25 +03:00
commit 0d1788ce44
3 changed files with 12 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/web/twitter_api/views/user_view.ex
View file

@ -21,17 +21,9 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
end
def render("user.json", %{user: user = %User{}} = assigns) do
for_user = assigns[:for]
allow_render =
User.remote_or_auth_active?(user) ||
(for_user && (for_user.id == user.id || User.superuser?(for_user)))
if allow_render do
render("valid_user.json", assigns)
else
render("invalid_user.json", assigns)
end
if User.visible_for?(user, assigns[:for]),
do: render("valid_user.json", assigns),
else: render("invalid_user.json", assigns)
end
def render("invalid_user.json", _assigns) do