diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-21 00:53:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-21 00:53:28 +0200 |
| commit | f1597e1ab90b1fb291f16977877c6ca79bf89676 (patch) | |
| tree | 7cb8facbd66c2199e173d2fc897863108b1fb398 /app/lib/activitypub/adapter.rb | |
| parent | 19c3a941e8ac53a6e1ab6e9c0aaadbc53dd0050f (diff) | |
| parent | 055450bc02732f654317096f56b03b77f5b84270 (diff) | |
Merge pull request #1158 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub/adapter.rb')
| -rw-r--r-- | app/lib/activitypub/adapter.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb index c259c96f4..a1d84de2f 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -33,6 +33,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base def serializable_hash(options = nil) options = serialization_options(options) serialized_hash = serializer.serializable_hash(options) + serialized_hash = serialized_hash.select { |k, _| options[:fields].include?(k) } if options[:fields] serialized_hash = self.class.transform_key_casing!(serialized_hash, instance_options) { '@context' => serialized_context }.merge(serialized_hash) |