Enable mediaproxy by default

This commit is contained in:
FloatingGhost 2022-06-08 17:19:42 +01:00
parent f225db8596
commit 0f2bfeaea7
2 changed files with 3 additions and 2 deletions

View file

@ -572,7 +572,7 @@ defp build_emoji_map(emoji, users, url, current_user) do
%{ %{
name: emoji, name: emoji,
count: length(users), count: length(users),
url: url, url: MediaProxy.url(url),
me: !!(current_user && current_user.ap_id in users) me: !!(current_user && current_user.ap_id in users)
} }
end end

View file

@ -6,6 +6,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionView do
use Pleroma.Web, :view use Pleroma.Web, :view
alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MediaProxy
def render("index.json", %{emoji_reactions: emoji_reactions} = opts) do def render("index.json", %{emoji_reactions: emoji_reactions} = opts) do
render_many(emoji_reactions, __MODULE__, "show.json", opts) render_many(emoji_reactions, __MODULE__, "show.json", opts)
@ -17,7 +18,7 @@ def render("show.json", %{emoji_reaction: {emoji, user_ap_ids, url}, user: user}
name: emoji, name: emoji,
count: length(users), count: length(users),
accounts: render(AccountView, "index.json", users: users, for: user), accounts: render(AccountView, "index.json", users: users, for: user),
url: url, url: MediaProxy.url(url),
me: !!(user && user.ap_id in user_ap_ids) me: !!(user && user.ap_id in user_ap_ids)
} }
end end