Fix some things in streaming and admin API for 3.3.0 support

1 files changed, 19 insertions, 19 deletions

diff --git a/tests/cassettes/test_suggested_tags.yaml b/tests/cassettes/test_suggested_tags.yaml
index 9be65f4..5d47247 100644
--- a/tests/cassettes/test_suggested_tags.yaml
+++ b/tests/cassettes/test_suggested_tags.yaml
@@ -20,19 +20,19 @@ interactions:
     uri: http://localhost:3000/api/v1/statuses
   response:
     body:
-      string: '{"id":"109336902417034250","created_at":"2022-11-13T14:12:10.738Z","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/109336902417034250","url":"http://localhost:3000/@mastodonpy_test/109336902417034250","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003ecool
+      string: '{"id":"109337443353375154","created_at":"2022-11-13T16:29:44.793Z","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/109337443353375154","url":"http://localhost:3000/@mastodonpy_test/109337443353375154","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003ecool
         free \u003ca href=\"http://localhost:3000/tags/ringtones\" class=\"mention
         hashtag\" rel=\"tag\"\u003e#\u003cspan\u003eringtones\u003c/span\u003e\u003c/a\u003e\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
+        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":2,"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":[{"name":"ringtones","url":"http://localhost:3000/tags/ringtones"}],"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":2,"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":[{"name":"ringtones","url":"http://localhost:3000/tags/ringtones"}],"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-u4MWoHq/yP84k1xM8+ieJg=='';
+        style-src ''self'' http://localhost:3000 ''nonce-7llOdy4ePulZWuUgqM4egw=='';
         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
@@ -42,7 +42,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"75706d4a2b7617ae4b361af798465a39"
+      - W/"6b3bbdef7aead13e8d7715ba4bef91af"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -62,11 +62,11 @@ interactions:
       X-RateLimit-Remaining:
       - '296'
       X-RateLimit-Reset:
-      - '2022-11-13T15:00:00.774130Z'
+      - '2022-11-13T18:00:00.881196Z'
       X-Request-Id:
-      - c01ec4eb-9dd0-4a45-aff7-62e96a5bc6b4
+      - 82892fae-ca10-46cd-acbb-05238dfff2dc
       X-Runtime:
-      - '0.056806'
+      - '0.145734'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -96,7 +96,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-vvabWeVNc43g8Sc6D8Wggw=='';
+        style-src ''self'' http://localhost:3000 ''nonce-yurft7jv4tKl9Aab0xVCHg=='';
         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
@@ -122,9 +122,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 360c7853-e629-4c9d-8c62-875082eda88d
+      - 41f1aaae-af3c-4a17-9df6-01a135fe0985
       X-Runtime:
-      - '0.015742'
+      - '0.015243'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -146,21 +146,21 @@ interactions:
       User-Agent:
       - tests/v311
     method: DELETE
-    uri: http://localhost:3000/api/v1/statuses/109336902417034250
+    uri: http://localhost:3000/api/v1/statuses/109337443353375154
   response:
     body:
-      string: '{"id":"109336902417034250","created_at":"2022-11-13T14:12:10.738Z","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/109336902417034250","url":"http://localhost:3000/@mastodonpy_test/109336902417034250","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"cool
+      string: '{"id":"109337443353375154","created_at":"2022-11-13T16:29:44.793Z","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/109337443353375154","url":"http://localhost:3000/@mastodonpy_test/109337443353375154","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"cool
         free #ringtones","filtered":[],"reblog":null,"application":{"name":"Mastodon.py
-        test suite","website":null},"account":{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        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":0,"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":[{"name":"ringtones","url":"http://localhost:3000/tags/ringtones"}],"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":0,"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":[{"name":"ringtones","url":"http://localhost:3000/tags/ringtones"}],"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-Vk65kVcA/GAUi4+lAKMF/g=='';
+        style-src ''self'' http://localhost:3000 ''nonce-BZWYHZf3/56Ru5WvSdMgdA=='';
         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
@@ -170,7 +170,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"29e83d6f5bc2fa829d74bbfdf6cea59d"
+      - W/"e9ca54b65dd36f2f3b9892435eef255f"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -186,9 +186,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 561388d4-d721-4420-8a0c-9d36b95f65eb
+      - 2326534d-bb6d-4443-b181-41d80c83d0cc
       X-Runtime:
-      - '0.032677'
+      - '0.035503'
       X-XSS-Protection:
       - 1; mode=block
     status: