moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#2456] Clarified `skip_relationships` option (and its default of `false`) for MastodonAPI.AccountView.

This commit is contained in:
Ivan Tashkinov 2020-05-09 19:03:07 +03:00
parent 14a49a0483
commit ac4250a18c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,16 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
# Default behaviour for account view is to include embedded relationships
# (e.g. when accounts are rendered on their own [e.g. a list of search results], not as
# embedded content in notifications / statuses).
# This option must be explicitly set to false when rendering accounts as embedded content.
defp initialize_skip_relationships(opts) do
Map.merge(%{skip_relationships: false}, opts)
end
def render("index.json", %{users: users} = opts) do def render("index.json", %{users: users} = opts) do
opts = Map.merge(%{skip_relationships: false}, opts) opts = initialize_skip_relationships(opts)
reading_user = opts[:for] reading_user = opts[:for]
@ -161,7 +169,7 @@ def render("relationships.json", %{user: user, targets: targets} = opts) do
end end
defp do_render("show.json", %{user: user} = opts) do defp do_render("show.json", %{user: user} = opts) do
opts = Map.merge(%{skip_relationships: false}, opts) opts = initialize_skip_relationships(opts)
user = User.sanitize_html(user, User.html_filter_policy(opts[:for])) user = User.sanitize_html(user, User.html_filter_policy(opts[:for]))
display_name = user.name || user.nickname display_name = user.name || user.nickname