diff options
| author | ThibG <thib@sitedethib.com> | 2020-09-07 14:16:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-07 14:16:54 +0200 |
| commit | 437d71bddf967573df3912ee5976f7c5a5a7b4c7 (patch) | |
| tree | 322231d7d50704edf8da762b69ee22c9850f2ce3 /app/lib/activitypub | |
| parent | d967251fdc3826ad27d30e55258cfa4cdfd7c871 (diff) | |
| parent | e5f934ddf0aa4ef9efbf45751bc00bebff768d99 (diff) | |
Merge pull request #1418 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb index 712c48823..4e406b41d 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -14,7 +14,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base moved_to: { 'movedTo' => { '@id' => 'as:movedTo', '@type' => '@id' } }, also_known_as: { 'alsoKnownAs' => { '@id' => 'as:alsoKnownAs', '@type' => '@id' } }, emoji: { 'toot' => 'http://joinmastodon.org/ns#', 'Emoji' => 'toot:Emoji' }, - featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' } }, + featured: { 'toot' => 'http://joinmastodon.org/ns#', 'featured' => { '@id' => 'toot:featured', '@type' => '@id' }, 'featuredTags' => { '@id' => 'toot:featuredTags', '@type' => '@id' } }, property_value: { 'schema' => 'http://schema.org#', 'PropertyValue' => 'schema:PropertyValue', 'value' => 'schema:value' }, atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' }, conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' }, |