Fix some things in streaming and admin API for 3.3.0 support

1 files changed, 17 insertions, 17 deletions

diff --git a/tests/cassettes/test_date_hook.yaml b/tests/cassettes/test_date_hook.yaml
index 7f60660..26f2a03 100644
--- a/tests/cassettes/test_date_hook.yaml
+++ b/tests/cassettes/test_date_hook.yaml
@@ -20,17 +20,17 @@ interactions:
     uri: http://localhost:3000/api/v1/statuses
   response:
     body:
-      string: '{"id":"109336904495893107","created_at":"2022-11-13T14:12:42.450Z","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/109336904495893107","url":"http://localhost:3000/@mastodonpy_test/109336904495893107","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":"109337445227760648","created_at":"2022-11-13T16:30:13.364Z","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/109337445227760648","url":"http://localhost:3000/@mastodonpy_test/109337445227760648","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":6,"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":6,"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-t5yDvmj2tnDqwjON0D/gOg=='';
+        style-src ''self'' http://localhost:3000 ''nonce-NcmnnUZDe5BlNiYY4nOpjQ=='';
         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/"8db46eea6a8908762a60e148f465b016"
+      - W/"65beb79c122cf7d4661a49b9ba3d09ba"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -58,13 +58,13 @@ interactions:
       X-RateLimit-Limit:
       - '300'
       X-RateLimit-Remaining:
-      - '289'
+      - '287'
       X-RateLimit-Reset:
-      - '2022-11-13T15:00:00.469749Z'
+      - '2022-11-13T18:00:00.384350Z'
       X-Request-Id:
-      - 1d63bbb8-9ef3-453a-8d17-9e00056df26f
+      - 700b7a04-0c88-47f3-b634-93ef1756d549
       X-Runtime:
-      - '0.031388'
+      - '0.031356'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -86,20 +86,20 @@ interactions:
       User-Agent:
       - tests/v311
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/109336904495893107
+    uri: http://localhost:3000/api/v1/statuses/109337445227760648
   response:
     body:
-      string: '{"id":"109336904495893107","created_at":"2022-11-13T14:12:42.450Z","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/109336904495893107","url":"http://localhost:3000/@mastodonpy_test/109336904495893107","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":"109337445227760648","created_at":"2022-11-13T16:30:13.364Z","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/109337445227760648","url":"http://localhost:3000/@mastodonpy_test/109337445227760648","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":5,"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":5,"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-zx6gz/lH9CiK9uB4eUT9MA=='';
+        style-src ''self'' http://localhost:3000 ''nonce-cEr+5rzV3MrjJ2Whi5644g=='';
         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
@@ -109,7 +109,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"33117a5fea5b366d248de3f587b688e9"
+      - W/"6c19ed1c51883f586f76ff212406d6b0"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -125,9 +125,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 0da6018b-c7d7-4a8f-a299-24714bae0770
+      - 31b58e13-dbcc-4b73-a7f3-29d839a7bdb3
       X-Runtime:
-      - '0.025857'
+      - '0.023941'
       X-XSS-Protection:
       - 1; mode=block
     status: