From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Wed, 8 Jun 2022 16:19:42 +0000 (+0100)
Subject: Enable mediaproxy by default
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0f2bfeaea75784b705a280960a797cfb37342252;p=akkoma

Enable mediaproxy by default
---

diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index e4057f108..90f6f8469 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -572,7 +572,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
     %{
       name: emoji,
       count: length(users),
-      url: url,
+      url: MediaProxy.url(url),
       me: !!(current_user && current_user.ap_id in users)
     }
   end
diff --git a/lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex b/lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex
index 3575f50da..85eb09d25 100644
--- a/lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex
+++ b/lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex
@@ -6,6 +6,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionView do
   use Pleroma.Web, :view
 
   alias Pleroma.Web.MastodonAPI.AccountView
+  alias Pleroma.Web.MediaProxy
 
   def render("index.json", %{emoji_reactions: emoji_reactions} = opts) do
     render_many(emoji_reactions, __MODULE__, "show.json", opts)
@@ -17,7 +18,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionView do
       name: emoji,
       count: length(users),
       accounts: render(AccountView, "index.json", users: users, for: user),
-      url: url,
+      url: MediaProxy.url(url),
       me: !!(user && user.ap_id in user_ap_ids)
     }
   end