New casettes, small fixes

1 files changed, 39 insertions, 27 deletions

diff --git a/tests/cassettes/test_stream_user_local.yaml b/tests/cassettes/test_stream_user_local.yaml
index 7d475cd..82407bf 100644
--- a/tests/cassettes/test_stream_user_local.yaml
+++ b/tests/cassettes/test_stream_user_local.yaml
@@ -10,19 +10,22 @@ 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,"created_at":"2018-05-06T22:36:57.850Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost:3000/@admin","avatar":"http://localhost:3000/avatars/original/missing.png","avatar_static":"http://localhost:3000/avatars/original/missing.png","header":"http://localhost:3000/headers/original/missing.png","header_static":"http://localhost:3000/headers/original/missing.png","followers_count":0,"following_count":0,"statuses_count":10,"source":{"privacy":"public","sensitive":false,"note":""}}'}
+    body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-06-05T19:58:37.960Z","note":"\u003cp\u003e\u003c/p\u003e","url":"http://localhost:3000/@admin","avatar":"http://localhost:3000/avatars/original/missing.png","avatar_static":"http://localhost:3000/avatars/original/missing.png","header":"http://localhost:3000/headers/original/missing.png","header_static":"http://localhost:3000/headers/original/missing.png","followers_count":1,"following_count":0,"statuses_count":2,"source":{"privacy":"public","sensitive":false,"note":"","fields":[]},"emojis":[],"fields":[]}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"15c11dfc23cf2cda445184d5e8460fcf"]
+      ETag: [W/"5a3cb8cc710fe491799791995af5fa74"]
+      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-Request-Id: [f82c5ff8-4dba-43bc-980e-07c37116b8e0]
-      X-Runtime: ['0.044216']
+      X-Permitted-Cross-Domain-Policies: [none]
+      X-Request-Id: [ba8279eb-7ec6-490a-9844-7f163b3a0d8f]
+      X-Runtime: ['0.053921']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['571']
+      content-length: ['618']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -40,13 +43,16 @@ interactions:
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"c63a2050dda59236b6c2a15e05a92893"]
+      ETag: [W/"a6d3db85e7e93705655b75b8c9346649"]
+      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-Request-Id: [9fd55e86-9eed-4329-a340-bc7ffe21a669]
-      X-Runtime: ['0.059000']
+      X-Permitted-Cross-Domain-Policies: [none]
+      X-Request-Id: [94910581-23c6-44f9-9dd4-8dc3e0e6b8f0]
+      X-Runtime: ['0.093588']
       X-XSS-Protection: [1; mode=block]
       content-length: ['175']
     status: {code: 200, message: OK}
@@ -61,19 +67,22 @@ interactions:
     method: GET
     uri: http://localhost:3000/api/v1/instance/
   response:
-    body: {string: '{"uri":"localhost:3000","title":"Mastodon","description":"","email":"","version":"2.3.3","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":13,"domain_count":0},"thumbnail":"http://localhost:3000/packs/preview.jpg","languages":["en"],"contact_account":null}'}
+    body: {string: '{"uri":"localhost:3000","title":"Mastodon","description":"","email":"","version":"2.4.1rc1","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":2,"status_count":24,"domain_count":0},"thumbnail":"http://localhost:3000/packs/preview.jpg","languages":["en"],"contact_account":null}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"421c4f340027980c909b39b22002b1f4"]
+      ETag: [W/"330ef056bff1805f153cdd937a313f49"]
+      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-Request-Id: [ffbc4aa1-8af6-4b46-b366-05aa2d3c0d6c]
-      X-Runtime: ['0.056935']
+      X-Permitted-Cross-Domain-Policies: [none]
+      X-Request-Id: [4bb124c8-471a-4cf9-9455-a772d14e1d7b]
+      X-Runtime: ['0.069462']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['292']
+      content-length: ['295']
     status: {code: 200, message: OK}
 - request:
     body: status=it%27s+cool+guy
@@ -88,23 +97,26 @@ interactions:
     method: POST
     uri: http://localhost:3000/api/v1/statuses
   response:
-    body: {string: '{"id":"99984807248835180","created_at":"2018-05-06T22:51:23.283Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"fy","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99984807248835180","content":"\u003cp\u003eit\u0026apos;s
-        cool guy\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99984807248835180","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+    body: {string: '{"id":"100154012619100124","created_at":"2018-06-05T20:02:32.332Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"fy","uri":"http://localhost:3000/users/mastodonpy_test/statuses/100154012619100124","content":"\u003cp\u003eit\u0026apos;s
+        cool guy\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/100154012619100124","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
         test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
-        Lennon","locked":true,"created_at":"2018-05-07T00:38:05.405Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","followers_count":0,"following_count":0,"statuses_count":4},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'}
+        Lennon","locked":true,"bot":false,"created_at":"2018-06-05T21:58:43.069Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","followers_count":0,"following_count":1,"statuses_count":23,"emojis":[],"fields":[{"name":"bread","value":"toasty."},{"name":"lasagna","value":"no!!!"}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'}
     headers:
       Cache-Control: ['max-age=0, private, must-revalidate']
       Content-Type: [application/json; charset=utf-8]
-      ETag: [W/"214f5dbab17261b078dbd3e22cf8dd0a"]
+      ETag: [W/"bccedf82eef77258d9135847e2049db6"]
+      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-Request-Id: [721d894f-4f7b-428a-8da6-a8a010460196]
-      X-Runtime: ['0.209618']
+      X-Permitted-Cross-Domain-Policies: [none]
+      X-Request-Id: [2422546a-b734-4372-a299-380416f5d1c9]
+      X-Runtime: ['0.208524']
       X-XSS-Protection: [1; mode=block]
-      content-length: ['1418']
+      content-length: ['1523']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -119,11 +131,11 @@ interactions:
   response:
     body: {string: 'event: update
 
-        data: {"id":"99984807248835180","created_at":"2018-05-06T22:51:23.283Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"fy","uri":"http://localhost:3000/users/mastodonpy_test/statuses/99984807248835180","content":"<p>it&apos;s
-        cool guy</p>","url":"http://localhost:3000/@mastodonpy_test/99984807248835180","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+        data: {"id":"100154012619100124","created_at":"2018-06-05T20:02:32.332Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"fy","uri":"http://localhost:3000/users/mastodonpy_test/statuses/100154012619100124","content":"<p>it&apos;s
+        cool guy</p>","url":"http://localhost:3000/@mastodonpy_test/100154012619100124","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
         test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
-        Lennon","locked":true,"created_at":"2018-05-07T00:38:05.405Z","note":"<p>I
-        walk funny</p>","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpeg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpeg","followers_count":0,"following_count":0,"statuses_count":4},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}
+        Lennon","locked":true,"bot":false,"created_at":"2018-06-05T21:58:43.069Z","note":"<p>I
+        walk funny</p>","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpg","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpg","followers_count":0,"following_count":1,"statuses_count":23,"emojis":[],"fields":[{"name":"bread","value":"toasty."},{"name":"lasagna","value":"no!!!"}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}
 
 
 '}
@@ -133,9 +145,9 @@ interactions:
       Access-Control-Allow-Origin: ['*']
       Connection: [keep-alive]
       Content-Type: [text/event-stream]
-      Date: ['Sun, 06 May 2018 22:51:23 GMT']
+      Date: ['Tue, 05 Jun 2018 20:02:32 GMT']
       Transfer-Encoding: [chunked]
       X-Powered-By: [Express]
-      X-Request-Id: [84741f72-f229-42ff-832c-8f1c4f1425bb]
+      X-Request-Id: [455f992e-1ac0-4f99-828b-829a09db2c87]
     status: {code: 200, message: OK}
 version: 1