squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).

Browse Source
This commit is contained in:
Ivan Tashkinov 2020-03-26 21:54:01 +03:00
parent 112101ca52
commit 6b793d3f83
3 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/pleroma/web/mastodon_api/views/account_view.ex
View File

@ -14,9 +14,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
def render("index.json", %{users: users} = opts) do def render("index.json", %{users: users} = opts) do
relationships_opt = relationships_opt =
if Map.has_key?(opts, :relationships) do cond do
Map.has_key?(opts, :relationships) ->
opts[:relationships] opts[:relationships]
else
is_nil(opts[:for]) ->
UserRelationship.view_relationships_option(nil, [])
true ->
UserRelationship.view_relationships_option(opts[:for], users) UserRelationship.view_relationships_option(opts[:for], users)
end end
@ -134,9 +139,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
def render("relationships.json", %{user: user, targets: targets} = opts) do def render("relationships.json", %{user: user, targets: targets} = opts) do
relationships_opt = relationships_opt =
if Map.has_key?(opts, :relationships) do cond do
Map.has_key?(opts, :relationships) ->
opts[:relationships] opts[:relationships]
else
is_nil(opts[:for]) ->
UserRelationship.view_relationships_option(nil, [])
true ->
UserRelationship.view_relationships_option(user, targets) UserRelationship.view_relationships_option(user, targets)
end end

9
lib/pleroma/web/mastodon_api/views/notification_view.ex
View File

@ -32,9 +32,14 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
|> Pleroma.Repo.all() |> Pleroma.Repo.all()
relationships_opt = relationships_opt =
if Map.has_key?(opts, :relationships) do cond do
Map.has_key?(opts, :relationships) ->
opts[:relationships] opts[:relationships]
else
is_nil(opts[:for]) ->
UserRelationship.view_relationships_option(nil, [])
true ->
move_activities_targets = move_activities_targets =
activities activities
|> Enum.filter(&(Activity.mastodon_notification_type(&1) == "move")) |> Enum.filter(&(Activity.mastodon_notification_type(&1) == "move"))

10
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -87,10 +87,16 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|> Repo.all() |> Repo.all()
relationships_opt = relationships_opt =
if Map.has_key?(opts, :relationships) do cond do
Map.has_key?(opts, :relationships) ->
opts[:relationships] opts[:relationships]
else
is_nil(opts[:for]) ->
UserRelationship.view_relationships_option(nil, [])
true ->
actors = Enum.map(activities ++ parent_activities, &get_user(&1.data["actor"])) actors = Enum.map(activities ++ parent_activities, &get_user(&1.data["actor"]))
UserRelationship.view_relationships_option(opts[:for], actors) UserRelationship.view_relationships_option(opts[:for], actors)
end end