From 881856553e0c2ba96cbe20ed7bbbbd02b4c60ef4 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 12 Sep 2017 00:16:18 +0200 Subject: Fix #4894 - Merge context hash into final JSON hash after key transform (#4898) --- app/lib/activitypub/adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/lib/activitypub/adapter.rb') diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb index 6ed66a239..3228a3f03 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -28,7 +28,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base def serializable_hash(options = nil) options = serialization_options(options) - serialized_hash = CONTEXT.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options)) - self.class.transform_key_casing!(serialized_hash, instance_options) + serialized_hash = ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options) + CONTEXT.merge(self.class.transform_key_casing!(serialized_hash, instance_options)) end end -- cgit From dce869dfc7d4e6338da2f0d72b0a9fb2bf6d5351 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 19 Sep 2017 05:05:48 +0200 Subject: 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(+) (limited to 'app/lib/activitypub/adapter.rb') 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 -- cgit