transmogrifier: Remove mastodon emoji-format from emoji field

2020-08-25 00:38:10 +02:00 · 2020-08-25 00:38:10 +02:00 · 2ecc7d9230
commit 2ecc7d9230
parent 9d63b2c9db
1 changed files with 0 additions and 3 deletions
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@ -318,9 +318,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
        Map.put(mapping, name, data["icon"]["url"])
      end)

-    # we merge mastodon and pleroma emoji into a single mapping, to allow for both wire formats
-    emoji = Map.merge(object["emoji"] || %{}, emoji)
-
    Map.put(object, "emoji", emoji)
  end