Fix some things in streaming and admin API for 3.3.0 support

1 files changed, 31 insertions, 31 deletions

diff --git a/tests/cassettes/test_report.yaml b/tests/cassettes/test_report.yaml
index 1007c64..c21810b 100644
--- a/tests/cassettes/test_report.yaml
+++ b/tests/cassettes/test_report.yaml
@@ -20,17 +20,17 @@ interactions:
     uri: http://localhost:3000/api/v1/statuses
   response:
     body:
-      string: '{"id":"109336907087334149","created_at":"2022-11-13T14:13:21.993Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109336907087334149","url":"http://localhost:3000/@mastodonpy_test/109336907087334149","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+      string: '{"id":"109337447822146623","created_at":"2022-11-13T16:30:52.951Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109337447822146623","url":"http://localhost:3000/@mastodonpy_test/109337447822146623","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eToot!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
         Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","followers_count":0,"following_count":0,"statuses_count":30,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":32,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-cN1U1Aod85nVmDEDn9egYg=='';
+        style-src ''self'' http://localhost:3000 ''nonce-wwE7Mpu6NU3pBlBW5HaCXA=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -40,7 +40,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"7695046294ff1167903776d4f27661ef"
+      - W/"43459bdd540562b317adce915dc1cff8"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -58,13 +58,13 @@ interactions:
       X-RateLimit-Limit:
       - '300'
       X-RateLimit-Remaining:
-      - '223'
+      - '221'
       X-RateLimit-Reset:
-      - '2022-11-13T15:00:00.013165Z'
+      - '2022-11-13T18:00:00.971452Z'
       X-Request-Id:
-      - e6a9b6b1-8a8e-4766-8fc7-2adb240edf33
+      - 86c38a65-2595-4f2f-9608-7008c3927c00
       X-Runtime:
-      - '0.032757'
+      - '0.032804'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -87,9 +87,9 @@ interactions:
     uri: http://localhost:3000/api/v1/accounts/verify_credentials
   response:
     body:
-      string: '{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+      string: '{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
         Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","followers_count":0,"following_count":0,"statuses_count":29,"last_status_at":"2022-11-13","noindex":false,"source":{"privacy":"public","sensitive":false,"language":null,"note":"I
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":31,"last_status_at":"2022-11-13","noindex":false,"source":{"privacy":"public","sensitive":false,"language":null,"note":"I
         walk funny","fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}],"follow_requests_count":0},"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}],"role":{"id":"-99","name":"","permissions":"65536","color":"","highlighted":false}}'
     headers:
       Cache-Control:
@@ -97,7 +97,7 @@ interactions:
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-3S42vUsZiRnN/cfnobliFQ=='';
+        style-src ''self'' http://localhost:3000 ''nonce-vEYwQtlABGWi577F0ivl1g=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -107,7 +107,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"7a2652a67be0c1c4b97f80a0c23f807c"
+      - W/"9500d391768581dfda3fa42155dce03e"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -123,16 +123,16 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 2df25e14-bfa9-4372-8c2d-9727dd235cee
+      - 35c9816b-5760-44be-a890-e82a382a452a
       X-Runtime:
-      - '0.011961'
+      - '0.019089'
       X-XSS-Protection:
       - 1; mode=block
     status:
       code: 200
       message: OK
 - request:
-    body: account_id=109336899193569236&comment=makes+the+bad+post&status_ids%5B%5D=109336907087334149
+    body: account_id=109337440686176140&comment=makes+the+bad+post&status_ids%5B%5D=109337447822146623
     headers:
       Accept:
       - '*/*'
@@ -153,16 +153,16 @@ interactions:
   response:
     body:
       string: '{"id":"2","action_taken":false,"action_taken_at":null,"category":"other","comment":"makes
-        the bad post","forwarded":false,"created_at":"2022-11-13T14:13:22.053Z","status_ids":[109336907087334149],"rule_ids":null,"target_account":{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        the bad post","forwarded":false,"created_at":"2022-11-13T16:30:53.009Z","status_ids":[109337447822146623],"rule_ids":null,"target_account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
         Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","followers_count":0,"following_count":0,"statuses_count":29,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]}}'
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":30,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]}}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-yM87ZKUIjWYhAyhjufsj2g=='';
+        style-src ''self'' http://localhost:3000 ''nonce-XQGX124wwlogTNOE/j1qxQ=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -172,7 +172,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"8db2fda7dee220e0f58771de13bc51d2"
+      - W/"14a81cceeb281ee8685b1c03cdba9049"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -192,11 +192,11 @@ interactions:
       X-RateLimit-Remaining:
       - '400'
       X-RateLimit-Reset:
-      - '2022-11-14T00:00:00.061479Z'
+      - '2022-11-14T00:00:00.021373Z'
       X-Request-Id:
-      - a3a4ea47-0b8d-406e-a7d6-8dc3c42308dd
+      - 2cf1aba4-2c58-4c71-a9d1-4ecc5269bd4f
       X-Runtime:
-      - '0.027523'
+      - '0.022183'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -218,20 +218,20 @@ interactions:
       User-Agent:
       - tests/v311
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/109336907087334149
+    uri: http://localhost:3000/api/v1/statuses/109337447822146623
   response:
     body:
-      string: '{"id":"109336907087334149","created_at":"2022-11-13T14:13:21.993Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109336907087334149","url":"http://localhost:3000/@mastodonpy_test/109336907087334149","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"Toot!","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+      string: '{"id":"109337447822146623","created_at":"2022-11-13T16:30:52.951Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"ja","uri":"http://localhost:3000/users/mastodonpy_test/statuses/109337447822146623","url":"http://localhost:3000/@mastodonpy_test/109337447822146623","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"Toot!","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"109337440686176140","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
         Lennon","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"\u003cp\u003eI
-        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/e639fe005819e5b9.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/26075346d9e9e361.jpg","followers_count":0,"following_count":0,"statuses_count":28,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/d6cd9a5a5e65da30.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/2b7760a42692fbde.jpg","followers_count":0,"following_count":0,"statuses_count":29,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[{"name":"bread","value":"toasty.","verified_at":null},{"name":"lasagna","value":"no!!!","verified_at":null}]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}'
     headers:
       Cache-Control:
       - no-store
       Content-Security-Policy:
       - 'base-uri ''none''; default-src ''none''; frame-ancestors ''none''; font-src
         ''self'' http://localhost:3000; img-src ''self'' https: data: blob: http://localhost:3000;
-        style-src ''self'' http://localhost:3000 ''nonce-/ClE2wa6KbQ+c0tCdpKNlQ=='';
+        style-src ''self'' http://localhost:3000 ''nonce-hpa4glgeHMhMUuPSpoHGcQ=='';
         media-src ''self'' https: data: http://localhost:3000; frame-src ''self''
         https:; manifest-src ''self'' http://localhost:3000; connect-src ''self''
         data: blob: http://localhost:3000 http://localhost:3000 ws://localhost:4000
@@ -241,7 +241,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"01f1f58399af799f5881d664f92d8ee4"
+      - W/"c6ac7f716def3dd4d5eba5e03f83dbaa"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -257,9 +257,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - a33fce99-b830-4238-bd55-7cc84369a127
+      - bdb789ae-6771-45ce-9f6b-d8400c1f9d80
       X-Runtime:
-      - '0.026154'
+      - '0.025474'
       X-XSS-Protection:
       - 1; mode=block
     status: