Merge branch 'bugfix/kroeg' into 'develop'

More kroeg bugfixes

See merge request pleroma/pleroma!353

1 files changed, 55 insertions, 0 deletions

diff --git a/test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json b/test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json
new file mode 100644
index 000000000..5c7c9c6d3
--- /dev/null
+++ b/test/fixtures/httpoison_mock/http___mastodon.example.org_users_admin_status_1234.json
@@ -0,0 +1,55 @@
+{
+    "@context": [
+        "https://www.w3.org/ns/activitystreams",
+        "https://w3id.org/security/v1",
+        {
+            "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+            "sensitive": "as:sensitive",
+            "movedTo": {
+                "@id": "as:movedTo",
+                "@type": "@id"
+            },
+            "Hashtag": "as:Hashtag",
+            "ostatus": "http://ostatus.org#",
+            "atomUri": "ostatus:atomUri",
+            "inReplyToAtomUri": "ostatus:inReplyToAtomUri",
+            "conversation": "ostatus:conversation",
+            "toot": "http://joinmastodon.org/ns#",
+            "Emoji": "toot:Emoji",
+            "focalPoint": {
+                "@container": "@list",
+                "@id": "toot:focalPoint"
+            },
+            "featured": {
+                "@id": "toot:featured",
+                "@type": "@id"
+            },
+            "schema": "http://schema.org#",
+            "PropertyValue": "schema:PropertyValue",
+            "value": "schema:value"
+        }
+    ],
+    "id": "http://mastodon.example.org/users/admin/statuses/100787282858396771",
+    "type": "Note",
+    "summary": null,
+    "inReplyTo": null,
+    "published": "2018-09-25T16:11:29Z",
+    "url": "https://mastodon.example.org/@admin/100787282858396771",
+    "attributedTo": "http://mastodon.example.org/users/admin",
+    "to": [
+        "https://www.w3.org/ns/activitystreams#Public"
+    ],
+    "cc": [
+        "http://mastodon.example.org/users/admin/followers"
+    ],
+    "sensitive": false,
+    "atomUri": "http://mastodon.example.org/users/admin/statuses/100787282858396771",
+    "inReplyToAtomUri": null,
+    "conversation": "tag:mastodon.social,2018-09-25:objectId=55659382:objectType=Conversation",
+    "content": "<p>the name&apos;s jond (jeans bond)</p>",
+    "contentMap": {
+        "en": "<p>the name&apos;s jond (jeans bond)</p>"
+    },
+    "attachment": [],
+    "tag": []
+}