From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 19 Sep 2017 03:05:48 +0000 (+0200)
Subject: Define emoji context for ActivityPub (#5004)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=dce869dfc7d4e6338da2f0d72b0a9fb2bf6d5351;p=mastodon.git

Define emoji context for ActivityPub (#5004)

* Define emoji context for ActivityPub

* Fix the emojo

* Use general Mastodon context instead
---

diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
index 3228a3f03..790d2025c 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