1 files changed, 25 insertions, 22 deletions

diff --git a/tests/cassettes/test_stream_user_local.yaml b/tests/cassettes/test_stream_user_local.yaml
index b8e78bd..daa22ff 100644
--- a/tests/cassettes/test_stream_user_local.yaml
+++ b/tests/cassettes/test_stream_user_local.yaml
@@ -10,7 +10,7 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/accounts/verify_credentials
   response:
-    body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2019-06-22T12:42:50.096Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","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":2,"following_count":1,"statuses_count":33,"last_status_at":"2019-10-12T21:01:45.075Z","source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[],"follow_requests_count":0},"emojis":[],"fields":[]}'}
+    body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2020-02-22T19:13:53.944Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost/@admin","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":"2020-02-22","source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[],"follow_requests_count":0},"emojis":[],"fields":[]}'}
     headers:
       Cache-Control: ['no-cache, no-store']
       Content-Type: [application/json; charset=utf-8]
@@ -21,10 +21,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [5174cfdc-9177-485d-80eb-66740a678bd0]
-      X-Runtime: ['0.031069']
+      X-Request-Id: [1f8b96b6-c78a-4428-974d-a86d47d1eed6]
+      X-Runtime: ['0.050175']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['680']
+      content-length: ['699']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -49,8 +49,8 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [394d8329-51d2-44a0-9d13-9b6a14da6cb5]
-      X-Runtime: ['0.028644']
+      X-Request-Id: [a35199a0-d2b2-4af6-9cfc-94b290dbd15b]
+      X-Runtime: ['0.046315']
       X-XSS-Protection: [1; mode=block]
       content-length: ['211']
     status: {code: 200, message: OK}
@@ -65,12 +65,12 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/instance/
   response:
-    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":34,"domain_count":0},"thumbnail":"http://localhost/packs/media/images/preview-9a17d32fc48369e8ccd910a75260e67d.jpg","languages":["en"],"registrations":true,"approval_required":false,"contact_account":null}'}
+    body: {string: '{"uri":"localhost","title":"Mastodon","short_description":"","description":"","email":"","version":"3.1.1","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":3,"status_count":4,"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: ['Sat, 12 Oct 2019 21:01:59 GMT']
-      ETag: [W/"b1cd0117fc529e198d2e886647ce8296"]
+      Date: ['Sat, 22 Feb 2020 19:30:10 GMT']
+      ETag: [W/"b0ffa42b1b8e2eb0e6a9b3dae373b272"]
       Referrer-Policy: [strict-origin-when-cross-origin]
       Transfer-Encoding: [chunked]
       Vary: ['Accept-Encoding, Origin']
@@ -78,10 +78,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [440ec0fb-5806-4293-a20a-cc7e4cf79c79]
-      X-Runtime: ['0.028512']
+      X-Request-Id: [a5901c8a-4df0-4746-9545-6458e7e8fcbb]
+      X-Runtime: ['0.047905']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['398']
+      content-length: ['397']
     status: {code: 200, message: OK}
 - request:
     body: status=it%27s+cool+guy
@@ -96,9 +96,9 @@ interactions:
     method: POST
     uri: http://localhost:3000/api/v1/statuses
   response:
-    body: {string: '{"id":"102951428073573330","created_at":"2019-10-12T21:02:04.665Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost/users/mastodonpy_test/statuses/102951428073573330","url":"http://localhost/@mastodonpy_test/102951428073573330","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"content":"\u003cp\u003eit\u0026apos;s
+    body: {string: '{"id":"103704154287057569","created_at":"2020-02-22T19:30:15.186Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost/users/mastodonpy_test/statuses/103704154287057569","url":"http://localhost/@mastodonpy_test/103704154287057569","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eit\u0026apos;s
         cool guy\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":2,"last_status_at":"2019-10-12T21:02:04.684Z","emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'}
+        suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":false,"bot":false,"discoverable":false,"group":false,"created_at":"2020-02-22T20:26:54.402Z","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":2,"last_status_at":"2020-02-22","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]
@@ -109,10 +109,10 @@ interactions:
       X-Download-Options: [noopen]
       X-Frame-Options: [SAMEORIGIN]
       X-Permitted-Cross-Domain-Policies: [none]
-      X-Request-Id: [45c561f8-c83d-41c1-9fb8-97f033fb4d60]
-      X-Runtime: ['0.199172']
+      X-Request-Id: [dfb25e3b-98fd-4270-b6b8-4377a469a4a2]
+      X-Runtime: ['0.266320']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1298']
+      content-length: ['1338']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -125,10 +125,12 @@ interactions:
     method: GET
     uri: http://localhost:4000/api/v1/streaming/user
   response:
-    body: {string: 'event: update
+    body: {string: ':)
 
-        data: {"id":"102951428073573330","created_at":"2019-10-12T21:02:04.665Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost/users/mastodonpy_test/statuses/102951428073573330","url":"http://localhost/@mastodonpy_test/102951428073573330","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"content":"<p>it&apos;s
-        cool guy</p>","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":"<p></p>","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":2,"last_status_at":"2019-10-12T21:02:04.684Z","emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}
+        event: update
+
+        data: {"id":"103704154287057569","created_at":"2020-02-22T19:30:15.186Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost/users/mastodonpy_test/statuses/103704154287057569","url":"http://localhost/@mastodonpy_test/103704154287057569","replies_count":0,"reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"<p>it&apos;s
+        cool guy</p>","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,"discoverable":false,"group":false,"created_at":"2020-02-22T20:26:54.402Z","note":"<p></p>","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":2,"last_status_at":"2020-02-22","emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}
 
 
         :'}
@@ -136,11 +138,12 @@ interactions:
       Access-Control-Allow-Headers: ['Authorization, Accept, Cache-Control']
       Access-Control-Allow-Methods: ['GET, OPTIONS']
       Access-Control-Allow-Origin: ['*']
+      Cache-Control: [no-store]
       Connection: [keep-alive]
       Content-Type: [text/event-stream]
-      Date: ['Sat, 12 Oct 2019 21:02:04 GMT']
+      Date: ['Sat, 22 Feb 2020 19:30:10 GMT']
       Transfer-Encoding: [chunked]
       X-Powered-By: [Express]
-      X-Request-Id: [5dbf1e91-dd66-4095-849b-5cedf4cee9e3]
+      X-Request-Id: [adfda15c-cfd5-495f-8392-44653eeea43c]
     status: {code: 200, message: OK}
 version: 1