1 files changed, 50 insertions, 16 deletions

diff --git a/tests/cassettes/test_status_card.yaml b/tests/cassettes/test_status_card.yaml
index 3a1bb69..6d3b66b 100644
--- a/tests/cassettes/test_status_card.yaml
+++ b/tests/cassettes/test_status_card.yaml
@@ -12,11 +12,11 @@ interactions:
     method: POST
     uri: http://localhost:3000/api/v1/statuses
   response:
-    body: {string: '{"id":"102317292638083847","created_at":"2019-06-22T21:13:05.818Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":null,"uri":"http://localhost/users/mastodonpy_test/statuses/102317292638083847","url":"http://localhost/@mastodonpy_test/102317292638083847","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"content":"\u003cp\u003e\u003ca
+    body: {string: '{"id":"102945951877929268","created_at":"2019-10-11T21:49:24.554Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":null,"uri":"http://localhost/users/mastodonpy_test/statuses/102945951877929268","url":"http://localhost/@mastodonpy_test/102945951877929268","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"content":"\u003cp\u003e\u003ca
         href=\"http://example.org/\" rel=\"nofollow noopener\" target=\"_blank\"\u003e\u003cspan
         class=\"invisible\"\u003ehttp://\u003c/span\u003e\u003cspan class=\"\"\u003eexample.org/\u003c/span\u003e\u003cspan
         class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e\u003c/p\u003e","reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T23:11:52.441Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@mastodonpy_test","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":1,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'}
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T23:11:52.441Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@mastodonpy_test","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":3,"last_status_at":"2019-10-11T21:49:24.561Z","emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'}
     headers:
       Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
@@ -27,10 +27,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [58c072b9-8e1b-4b32-b32b-23945863dd0f]
-      X-Runtime: ['0.142482']
+      X-Request-Id: [b158abe2-ab97-4a78-8a07-efb0830255d2]
+      X-Runtime: ['0.214115']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1500']
+      content-length: ['1544']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -41,9 +41,43 @@ interactions:
       Connection: [keep-alive]
       User-Agent: [python-requests/2.18.4]
     method: GET
-    uri: http://localhost:3000/api/v1/statuses/102317292638083847/card
+    uri: http://localhost:3000/api/v1/instance/
   response:
-    body: {string: '{"url":"http://example.org/","title":"Example Domain","description":"","type":"link","author_name":"","author_url":"","provider_name":"","provider_url":"","html":"","width":0,"height":0,"image":null,"embed_url":""}'}
+    body: {string: '{"uri":"localhost","title":"Mastodon","short_description":"","description":"","email":"","version":"3.0.1","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":3,"status_count":31,"domain_count":0},"thumbnail":"http://localhost/packs/media/images/preview-9a17d32fc48369e8ccd910a75260e67d.jpg","languages":["en"],"registrations":true,"approval_required":false,"contact_account":null}'}
+    headers:
+      Cache-Control: ['max-age=180, public']
+      Content-Type: [application/json; charset=utf-8]
+      Date: ['Fri, 11 Oct 2019 21:49:29 GMT']
+      ETag: [W/"3fbb4923b64014b2349189576131bf91"]
+      Referrer-Policy: [strict-origin-when-cross-origin]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Content-Type-Options: [nosniff]
+      X-Download-Options: [noopen]
+      X-Frame-Options: [SAMEORIGIN]
+      X-Permitted-Cross-Domain-Policies: [none]
+      X-Request-Id: [be6f03b5-9556-4199-bcf9-84735a576d1b]
+      X-Runtime: ['0.048093']
+      X-XSS-Protection: [1; mode=block]
+      content-length: ['398']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Connection: [keep-alive]
+      User-Agent: [python-requests/2.18.4]
+    method: GET
+    uri: http://localhost:3000/api/v1/statuses/102945951877929268
+  response:
+    body: {string: '{"id":"102945951877929268","created_at":"2019-10-11T21:49:24.554Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":null,"uri":"http://localhost/users/mastodonpy_test/statuses/102945951877929268","url":"http://localhost/@mastodonpy_test/102945951877929268","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"content":"\u003cp\u003e\u003ca
+        href=\"http://example.org/\" rel=\"nofollow noopener\" target=\"_blank\"\u003e\u003cspan
+        class=\"invisible\"\u003ehttp://\u003c/span\u003e\u003cspan class=\"\"\u003eexample.org/\u003c/span\u003e\u003cspan
+        class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e\u003c/p\u003e","reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T23:11:52.441Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@mastodonpy_test","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":3,"last_status_at":"2019-10-11T21:49:24.561Z","emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":{"url":"http://example.org/","title":"Example
+        Domain","description":"","type":"link","author_name":"","author_url":"","provider_name":"","provider_url":"","html":"","width":0,"height":0,"image":null,"embed_url":""},"poll":null}'}
     headers:
       Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
@@ -54,10 +88,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [93c6bc96-01a7-4a69-8def-d5ca22e38804]
-      X-Runtime: ['0.031292']
+      X-Request-Id: [f3bc3f48-a459-4f85-b6e9-8f55aaa3d980]
+      X-Runtime: ['0.083644']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['214']
+      content-length: ['1754']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -69,10 +103,10 @@ interactions:
       Content-Length: ['0']
       User-Agent: [python-requests/2.18.4]
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/102317292638083847
+    uri: http://localhost:3000/api/v1/statuses/102945951877929268
   response:
-    body: {string: '{"id":"102317292638083847","created_at":"2019-06-22T21:13:05.818Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":null,"uri":"http://localhost/users/mastodonpy_test/statuses/102317292638083847","url":"http://localhost/@mastodonpy_test/102317292638083847","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"text":"http://example.org/","reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T23:11:52.441Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@mastodonpy_test","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":1,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":{"url":"http://example.org/","title":"Example
+    body: {string: '{"id":"102945951877929268","created_at":"2019-10-11T21:49:24.554Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":null,"uri":"http://localhost/users/mastodonpy_test/statuses/102945951877929268","url":"http://localhost/@mastodonpy_test/102945951877929268","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"text":"http://example.org/","reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T23:11:52.441Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@mastodonpy_test","avatar":"http://localhost/avatars/original/missing.png","avatar_static":"http://localhost/avatars/original/missing.png","header":"http://localhost/headers/original/missing.png","header_static":"http://localhost/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":3,"last_status_at":"2019-10-11T21:49:24.561Z","emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":{"url":"http://example.org/","title":"Example
         Domain","description":"","type":"link","author_name":"","author_url":"","provider_name":"","provider_url":"","html":"","width":0,"height":0,"image":null,"embed_url":""},"poll":null}'}
     headers:
       Cache-Control: ['no-cache, no-store']
@@ -84,9 +118,9 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [92900f7b-ad4f-4d94-95ed-0b3564ef4aec]
-      X-Runtime: ['0.077313']
+      X-Request-Id: [c0bd71c4-1bce-4492-a381-aec1a16cbc18]
+      X-Runtime: ['0.115444']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1430']
+      content-length: ['1474']
     status: {code: 200, message: OK}
 version: 1