Merge pull request 'Update elixir versions' (#512) from norm/akkoma:update-elixir...

[akkoma] / lib / pleroma / web / pleroma_api / views / emoji_reaction_view.ex

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 3575f50da48770ba4994b6aac6087f84f903a54f..4335228b6b10ee00ed0c09438c68921bdeac8775 100644 (file)
--- 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,19 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionView do
   use Pleroma.Web, :view
 
   alias Pleroma.Web.MastodonAPI.AccountView
+  alias Pleroma.Web.MediaProxy
+
+  def emoji_name(emoji, nil), do: emoji
+
+  def emoji_name(emoji, url) do
+    url = URI.parse(url)
+
+    if url.host == Pleroma.Web.Endpoint.host() do
+      emoji
+    else
+      "#{emoji}@#{url.host}"
+    end
+  end
 
   def render("index.json", %{emoji_reactions: emoji_reactions} = opts) do
     render_many(emoji_reactions, __MODULE__, "show.json", opts)
@@ -13,11 +26,12 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionView do
 
   def render("show.json", %{emoji_reaction: {emoji, user_ap_ids, url}, user: user}) do
     users = fetch_users(user_ap_ids)
+
     %{
-      name: emoji,
+      name: emoji_name(emoji, url),
       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