projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into chore/elixir-1.11
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
account_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/account_view.ex
b/lib/pleroma/web/mastodon_api/views/account_view.ex
index b929d5a036af2dbbd59d588f84ce33f27b8dce43..121ba1693155adf30f4c17b9be4d0c9b111bf001 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-39,11
+39,12
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
@doc """
Renders specified user account.
@doc """
Renders specified user account.
- :
force
option skips visibility check and renders any user (local or remote)
+ :
skip_visibility_check
option skips visibility check and renders any user (local or remote)
regardless of [:pleroma, :restrict_unauthenticated] setting.
:for option specifies the requester and can be a User record or nil.
regardless of [:pleroma, :restrict_unauthenticated] setting.
:for option specifies the requester and can be a User record or nil.
+ Only use `user: user, for: user` when `user` is the actual requester of own profile.
"""
"""
- def render("show.json", %{user: _user,
force
: true} = opts) do
+ def render("show.json", %{user: _user,
skip_visibility_check
: true} = opts) do
do_render("show.json", opts)
end
do_render("show.json", opts)
end
@@
-56,7
+57,8
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
end
def render("show.json", _) do
end
def render("show.json", _) do
- raise "In order to prevent account accessibility issues, :force or :for option is required."
+ raise "In order to prevent account accessibility issues, " <>
+ ":skip_visibility_check or :for option is required."
end
def render("mention.json", %{user: user}) do
end
def render("mention.json", %{user: user}) do
@@
-179,8
+181,10
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
user = User.sanitize_html(user, User.html_filter_policy(opts[:for]))
display_name = user.name || user.nickname
user = User.sanitize_html(user, User.html_filter_policy(opts[:for]))
display_name = user.name || user.nickname
- image = User.avatar_url(user) |> MediaProxy.url()
+ avatar = User.avatar_url(user) |> MediaProxy.url()
+ avatar_static = User.avatar_url(user) |> MediaProxy.preview_url(static: true)
header = User.banner_url(user) |> MediaProxy.url()
header = User.banner_url(user) |> MediaProxy.url()
+ header_static = User.banner_url(user) |> MediaProxy.preview_url(static: true)
following_count =
if !user.hide_follows_count or !user.hide_follows or opts[:for] == user do
following_count =
if !user.hide_follows_count or !user.hide_follows or opts[:for] == user do
@@
-243,12
+247,12
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
followers_count: followers_count,
following_count: following_count,
statuses_count: user.note_count,
followers_count: followers_count,
following_count: following_count,
statuses_count: user.note_count,
- note: user.bio
|| ""
,
+ note: user.bio,
url: user.uri || user.ap_id,
url: user.uri || user.ap_id,
- avatar:
image
,
- avatar_static:
image
,
+ avatar:
avatar
,
+ avatar_static:
avatar_static
,
header: header,
header: header,
- header_static: header,
+ header_static: header
_static
,
emojis: emojis,
fields: user.fields,
bot: bot,
emojis: emojis,
fields: user.fields,
bot: bot,