summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-08-25 00:38:10 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-09-01 08:29:53 +0200
commit2ecc7d92308d624dc9edb50665d752a71f55f608 (patch)
tree80f1f64cf73a34198998c6cb26c10c648dc2a6cc
parent9d63b2c9db88ffdeb608df427caf2996eb0bb094 (diff)
transmogrifier: Remove mastodon emoji-format from emoji field
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex3
1 files changed, 0 insertions, 3 deletions
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