diff options
author | lain <lain@soykaf.club> | 2019-12-02 16:26:19 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-12-02 16:26:19 +0000 |
commit | 7722e5a67a46304f3ae0e37f674a44ca9268be5e (patch) | |
tree | 504f7b7623c6917fcfa567050d80153e2f2aee11 /test/fixtures | |
parent | d468cba2d56f60a41b0372a381b1017a8d2d046b (diff) | |
parent | 1fc28a4b441fdc0de8b2b43e2b045da38ee50b0a (diff) | |
download | pleroma-7722e5a67a46304f3ae0e37f674a44ca9268be5e.tar.gz |
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
Diffstat (limited to 'test/fixtures')
-rw-r--r-- | test/fixtures/tesla_mock/admin@mastdon.example.org.json | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/fixtures/tesla_mock/admin@mastdon.example.org.json b/test/fixtures/tesla_mock/admin@mastdon.example.org.json index 8159dc20a..9fdd6557c 100644 --- a/test/fixtures/tesla_mock/admin@mastdon.example.org.json +++ b/test/fixtures/tesla_mock/admin@mastdon.example.org.json @@ -9,7 +9,11 @@ "inReplyToAtomUri": "ostatus:inReplyToAtomUri", "conversation": "ostatus:conversation", "toot": "http://joinmastodon.org/ns#", - "Emoji": "toot:Emoji" + "Emoji": "toot:Emoji", + "alsoKnownAs": { + "@id": "as:alsoKnownAs", + "@type": "@id" + } }], "id": "http://mastodon.example.org/users/admin", "type": "Person", @@ -50,5 +54,6 @@ "type": "Image", "mediaType": "image/png", "url": "https://cdn.niu.moe/accounts/headers/000/033/323/original/850b3448fa5fd477.png" - } + }, + "alsoKnownAs": ["http://example.org/users/foo"] } |