From dce869dfc7d4e6338da2f0d72b0a9fb2bf6d5351 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 19 Sep 2017 05:05:48 +0200
Subject: [PATCH] Define emoji context for ActivityPub (#5004)

* Define emoji context for ActivityPub

* Fix the emojo

* Use general Mastodon context instead
---
 app/lib/activitypub/adapter.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 3228a3f03d5..790d2025cfc 100644
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@@ -14,6 +14,8 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
         'atomUri'                   => 'ostatus:atomUri',
         'inReplyToAtomUri'          => 'ostatus:inReplyToAtomUri',
         'conversation'              => 'ostatus:conversation',
+        'toot'                      => 'http://joinmastodon.org/ns#',
+        'Emoji'                     => 'toot:Emoji',
       },
     ],
   }.freeze