From 936b595837b5b10dbb8a2ba6e4aa1cd9907a30c9 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Mon, 18 Feb 2019 21:32:36 +0100
Subject: [PATCH] =?UTF-8?q?Revert=20"Web.ActivityPub.Transmogrifier:=20Don?=
 =?UTF-8?q?=E2=80=99t=20overwrite=20emoji=20in=20add=5Femoji=5Ftags/1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit bfd10516c929623fdafb0179d050f894f8a399f7.
---
 lib/pleroma/web/activity_pub/transmogrifier.ex | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 5214d298c..41d89a02b 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -800,6 +800,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
   # TODO: we should probably send mtime instead of unix epoch time for updated
   def add_emoji_tags(object) do
     tags = object["tag"] || []
+    emoji = object["emoji"] || []
 
     out =
       emoji