From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Mon, 24 Aug 2020 22:38:10 +0000 (+0200)
Subject: transmogrifier: Remove mastodon emoji-format from emoji field
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2ecc7d92308d624dc9edb50665d752a71f55f608;p=akkoma

transmogrifier: Remove mastodon emoji-format from emoji field
---

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 76298c4a0..0831efadc 100644
--- 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