X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fpleroma_api%2Fviews%2Femoji_reaction_view.ex;h=4335228b6b10ee00ed0c09438c68921bdeac8775;hb=62e22eeff23b8841e3cdc7e4a4ee6ef29b612aca;hp=809ef9b4065c85ed8cb74fe681eab5814784ceef;hpb=2926713fe5c36b8fc64bcce13ca16bc12eaff96c;p=akkoma

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 809ef9b40..4335228b6 100644
--- a/lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex
+++ b/lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex
@@ -6,18 +6,32 @@ 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)
   end
 
-  def render("show.json", %{emoji_reaction: {emoji, user_ap_ids}, user: user}) 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: MediaProxy.url(url),
       me: !!(user && user.ap_id in user_ap_ids)
     }
   end
@@ -26,7 +40,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionView do
     user_ap_ids
     |> Enum.map(&Pleroma.User.get_cached_by_ap_id/1)
     |> Enum.filter(fn
-      %{deactivated: false} -> true
+      %{is_active: true} -> true
       _ -> false
     end)
   end