diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-07-10 16:19:16 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-07-10 16:19:16 +0000 |
| commit | 420da14b61016c4a330571d3a902e21c0b509247 (patch) | |
| tree | 4fbd2ded1e3acfab5ceef08550e4ca68da5d1bb7 /lib | |
| parent | 29f4ab640b0269fc7751fca7c24cda5be912d1e5 (diff) | |
| parent | 2efc0ffcf0beea2f65e1c2b0857da9d6739eee8e (diff) | |
| download | pleroma-420da14b61016c4a330571d3a902e21c0b509247.tar.gz pleroma-420da14b61016c4a330571d3a902e21c0b509247.zip | |
Merge branch 'from/upstream-develop/tusooa/2830-remote-fo-mp' into 'develop'
Pass remote follow avatar into media proxy
Closes #2830
See merge request pleroma/pleroma!3690
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/remote_follow_view.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/views/remote_follow_view.ex b/lib/pleroma/web/twitter_api/views/remote_follow_view.ex index bd33d4c0a..8902261b0 100644 --- a/lib/pleroma/web/twitter_api/views/remote_follow_view.ex +++ b/lib/pleroma/web/twitter_api/views/remote_follow_view.ex @@ -7,5 +7,9 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowView do import Phoenix.HTML.Form alias Pleroma.Web.Gettext - defdelegate avatar_url(user), to: Pleroma.User + def avatar_url(user) do + user + |> Pleroma.User.avatar_url() + |> Pleroma.Web.MediaProxy.url() + end end |