about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-09-19 05:05:48 +0200
committerGitHub <noreply@github.com>2017-09-19 05:05:48 +0200
commitdce869dfc7d4e6338da2f0d72b0a9fb2bf6d5351 (patch)
treeb8f0330e0b4f7f690fb5ea8f417418aa73e0b179 /app/lib
parent09a94b575e90dc7f6e179a1ec717156e725f915a (diff)
Define emoji context for ActivityPub (#5004)
* Define emoji context for ActivityPub

* Fix the emojo

* Use general Mastodon context instead
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/activitypub/adapter.rb2
1 files changed, 2 insertions, 0 deletions
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