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

Move get_favicon to Pleroma.Instances, use /

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-03-02 05:38:25 +01:00
commit 6a679d80c9
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
7 changed files with 353 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -204,6 +204,15 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
%{}
end
favicon =
user
|> Map.get(:ap_id, "")
|> URI.parse()
|> URI.merge("/")
|> to_string()
|> Pleroma.Instances.get_cached_favicon()
|> MediaProxy.url()
%{
id: to_string(user.id),
username: username_from_nickname(user.nickname),
@ -246,7 +255,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
relationship: relationship,
skip_thread_containment: user.skip_thread_containment,
background_image: image_url(user.background) |> MediaProxy.url(),
favicon: User.get_cached_favicon(user) |> MediaProxy.url()
favicon: favicon
}
}
|> maybe_put_role(user, opts[:for])