Fix some things in streaming and admin API for 3.3.0 support

1 files changed, 32 insertions, 32 deletions

diff --git a/tests/cassettes/test_account_search.yaml b/tests/cassettes/test_account_search.yaml
index bb1a829..8a2b153 100644
--- a/tests/cassettes/test_account_search.yaml
+++ b/tests/cassettes/test_account_search.yaml
@@ -16,14 +16,14 @@ interactions:
     uri: http://localhost:3000/api/v1/accounts/search?q=admin&following=0
   response:
     body:
-      string: '[{"id":"109336898971915318","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]},{"id":"109336899086433362","username":"admin2","acct":"admin2","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","url":"http://localhost:3000/@admin2","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]}]'
+      string: '[{"id":"109337440467895233","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]},{"id":"109337440575107632","username":"admin2","acct":"admin2","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","url":"http://localhost:3000/@admin2","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]}]'
     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-hM1NrfkS/PFTxoXNRQDbKg=='';
+        style-src ''self'' http://localhost:3000 ''nonce-MoeBrXQp6N1YXcxqa/hVgw=='';
         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
@@ -33,7 +33,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"1b186702db499a3f98d74e97f3c0f353"
+      - W/"fd90f5989e14c7bd621d7cbb5bdac3cb"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -49,16 +49,16 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 0f2fe1af-6302-4a5d-b5a6-306d4e794edd
+      - fcb4d02d-4b52-47e7-9ad1-fb4942e963e9
       X-Runtime:
-      - '0.018001'
+      - '0.017932'
       X-XSS-Protection:
       - 1; mode=block
     status:
       code: 200
       message: OK
 - request:
-    body: id=109336898971915318&reblogs=1&notify=0
+    body: id=109337440467895233&reblogs=1&notify=0
     headers:
       Accept:
       - '*/*'
@@ -75,17 +75,17 @@ interactions:
       User-Agent:
       - tests/v311
     method: POST
-    uri: http://localhost:3000/api/v1/accounts/109336898971915318/follow
+    uri: http://localhost:3000/api/v1/accounts/109337440467895233/follow
   response:
     body:
-      string: '{"id":"109336898971915318","following":true,"showing_reblogs":true,"notifying":false,"languages":null,"followed_by":false,"blocking":false,"blocked_by":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false,"endorsed":false,"note":""}'
+      string: '{"id":"109337440467895233","following":true,"showing_reblogs":true,"notifying":false,"languages":null,"followed_by":false,"blocking":false,"blocked_by":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false,"endorsed":false,"note":""}'
     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-qxNfhCO9emd9jVgzPpLM5A=='';
+        style-src ''self'' http://localhost:3000 ''nonce-j5Ykmyn5vzLYLxlQJGa4rA=='';
         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
@@ -95,7 +95,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"0c6748228fe729d68e4376f765e96f2f"
+      - W/"f41bc668e73edcd14927a1be77af4e10"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -115,11 +115,11 @@ interactions:
       X-RateLimit-Remaining:
       - '399'
       X-RateLimit-Reset:
-      - '2022-11-14T00:00:00.480556Z'
+      - '2022-11-14T00:00:00.477728Z'
       X-Request-Id:
-      - 1632a69c-d195-4644-967b-09d4e717d3f6
+      - 607939e7-058f-435f-bb87-411cf6b34d36
       X-Runtime:
-      - '0.045604'
+      - '0.030497'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -142,14 +142,14 @@ interactions:
     uri: http://localhost:3000/api/v1/accounts/search?q=admin&following=1
   response:
     body:
-      string: '[{"id":"109336898971915318","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]}]'
+      string: '[{"id":"109337440467895233","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]}]'
     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-+ztzGhgxXtvr7nS+lBsIrg=='';
+        style-src ''self'' http://localhost:3000 ''nonce-enmk2TPCP+/Ixsd/dYJgjw=='';
         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
@@ -159,7 +159,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"f56dd4acf7c0c299e1d42a2d7c0c520b"
+      - W/"a28dd5b97fe3d6be03a9efb65a44c10b"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -175,9 +175,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - d22e7278-70fd-42d8-a6ec-0f8020f3cd53
+      - 13d8dc1c-8e22-4156-8f66-dc8ebfd20d8e
       X-Runtime:
-      - '0.012074'
+      - '0.010986'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -199,17 +199,17 @@ interactions:
       User-Agent:
       - tests/v311
     method: POST
-    uri: http://localhost:3000/api/v1/accounts/109336898971915318/unfollow
+    uri: http://localhost:3000/api/v1/accounts/109337440467895233/unfollow
   response:
     body:
-      string: '{"id":"109336898971915318","following":false,"showing_reblogs":false,"notifying":false,"languages":null,"followed_by":false,"blocking":false,"blocked_by":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false,"endorsed":false,"note":""}'
+      string: '{"id":"109337440467895233","following":false,"showing_reblogs":false,"notifying":false,"languages":null,"followed_by":false,"blocking":false,"blocked_by":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false,"endorsed":false,"note":""}'
     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-9F2EcEvGOog3jcb6VpWudA=='';
+        style-src ''self'' http://localhost:3000 ''nonce-W2RFER49n95xaEY/ENpeCQ=='';
         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
@@ -219,7 +219,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"b9dd6d5b54697012fa8e870d86d958d3"
+      - W/"214f278429bf712708e952ee2355bf5e"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -235,9 +235,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 0becb411-9805-445b-9b93-c990025be0b9
+      - b05d6a99-86b3-490f-8da5-1a6a2475c72e
       X-Runtime:
-      - '0.022377'
+      - '0.021831'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -267,7 +267,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-aWvm9MR1Vb9ns6zyD5U78g=='';
+        style-src ''self'' http://localhost:3000 ''nonce-ZOZu1/F01VoA0O2M4ReWRw=='';
         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
@@ -293,9 +293,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 515f5bc4-55a2-4fa4-83a0-8ceea95647fe
+      - 9b2d3352-857b-494a-bdb5-f7ab09f56467
       X-Runtime:
-      - '0.008051'
+      - '0.007927'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -318,14 +318,14 @@ interactions:
     uri: http://localhost:3000/api/v1/accounts/search?q=admin&following=0
   response:
     body:
-      string: '[{"id":"109336898971915318","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]},{"id":"109336899086433362","username":"admin2","acct":"admin2","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","url":"http://localhost:3000/@admin2","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]}]'
+      string: '[{"id":"109337440467895233","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]},{"id":"109337440575107632","username":"admin2","acct":"admin2","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-13T00:00:00.000Z","note":"","url":"http://localhost:3000/@admin2","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":0,"last_status_at":null,"noindex":false,"emojis":[],"fields":[]}]'
     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-7H7XbzH4x8pFWp7cMwCkyw=='';
+        style-src ''self'' http://localhost:3000 ''nonce-+oCof0CRAlbIG88eMH/JPg=='';
         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
@@ -335,7 +335,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"1b186702db499a3f98d74e97f3c0f353"
+      - W/"fd90f5989e14c7bd621d7cbb5bdac3cb"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -351,9 +351,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 96d8685c-f42c-4034-a261-815731bba43f
+      - a8b24e0b-50a6-48e1-9298-671d53df9913
       X-Runtime:
-      - '0.012444'
+      - '0.012986'
       X-XSS-Protection:
       - 1; mode=block
     status: