diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-31 00:37:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-31 00:37:16 +0100 |
| commit | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (patch) | |
| tree | 324003d03c66caead9842a6052bc28caf7f654c2 /app/lib/activitypub | |
| parent | b6fa500806f68d5394174e1f341dc61e3578760e (diff) | |
| parent | b72950fbd3536260df0b9c22179a6024d4d0c189 (diff) | |
Merge pull request #976 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub')
| -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 7e0b16c25..94eb2899c 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -18,6 +18,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' }, conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' }, focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } }, + identity_proof: { 'toot' => 'http://joinmastodon.org/ns#', 'IdentityProof' => 'toot:IdentityProof' }, }.freeze def self.default_key_transform |