projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into media-proxy
[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 16322cf219ea884654da118f32ec9ef991299a66..1d5918988822400da00be251f1948ca660a77f7e 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-3,8
+3,9
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
alias Pleroma.User
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.User
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.CommonAPI.Utils
+ alias Pleroma.Web.MediaProxy
- defp image_url(%{"url" => [ %{ "href" => href } |
t
]}), do: href
+ defp image_url(%{"url" => [ %{ "href" => href } |
_
]}), do: href
defp image_url(_), do: nil
def render("accounts.json", %{users: users} = opts) do
defp image_url(_), do: nil
def render("accounts.json", %{users: users} = opts) do
@@
-12,10
+13,10
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
end
def render("account.json", %{user: user}) do
end
def render("account.json", %{user: user}) do
- image = User.avatar_url(user)
+ image = User.avatar_url(user)
|> MediaProxy.url()
user_info = User.user_info(user)
user_info = User.user_info(user)
- header =
image_url(user.info["banner"]) || "https://placehold.it/700x335"
+ header =
(image_url(user.info["banner"]) || "https://placehold.it/700x335") |> MediaProxy.url()
%{
id: to_string(user.id),
%{
id: to_string(user.id),