Fix some things in streaming and admin API for 3.3.0 support

1 files changed, 26 insertions, 26 deletions

diff --git a/tests/cassettes/test_account_update_credentials.yaml b/tests/cassettes/test_account_update_credentials.yaml
index 72c8d57..2e5a653 100644
--- a/tests/cassettes/test_account_update_credentials.yaml
+++ b/tests/cassettes/test_account_update_credentials.yaml
@@ -1,21 +1,21 @@
 interactions:
 - request:
     body: !!binary |
-      LS0xMDQ4NjcxNmM2Zjc2NGY3MzM4NDcxNmQxNmNjZWM5ZA0KQ29udGVudC1EaXNwb3NpdGlvbjog
-      Zm9ybS1kYXRhOyBuYW1lPSJkaXNwbGF5X25hbWUiDQoNCkpvaG4gTGVubm9uDQotLTEwNDg2NzE2
-      YzZmNzY0ZjczMzg0NzE2ZDE2Y2NlYzlkDQpDb250ZW50LURpc3Bvc2l0aW9uOiBmb3JtLWRhdGE7
-      IG5hbWU9Im5vdGUiDQoNCkkgd2FsayBmdW5ueQ0KLS0xMDQ4NjcxNmM2Zjc2NGY3MzM4NDcxNmQx
-      NmNjZWM5ZA0KQ29udGVudC1EaXNwb3NpdGlvbjogZm9ybS1kYXRhOyBuYW1lPSJmaWVsZHNfYXR0
-      cmlidXRlc1swXVtuYW1lXSINCg0KYnJlYWQNCi0tMTA0ODY3MTZjNmY3NjRmNzMzODQ3MTZkMTZj
-      Y2VjOWQNCkNvbnRlbnQtRGlzcG9zaXRpb246IGZvcm0tZGF0YTsgbmFtZT0iZmllbGRzX2F0dHJp
-      YnV0ZXNbMF1bdmFsdWVdIg0KDQp0b2FzdHkuDQotLTEwNDg2NzE2YzZmNzY0ZjczMzg0NzE2ZDE2
-      Y2NlYzlkDQpDb250ZW50LURpc3Bvc2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9ImZpZWxkc19hdHRy
-      aWJ1dGVzWzFdW25hbWVdIg0KDQpsYXNhZ25hDQotLTEwNDg2NzE2YzZmNzY0ZjczMzg0NzE2ZDE2
-      Y2NlYzlkDQpDb250ZW50LURpc3Bvc2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9ImZpZWxkc19hdHRy
-      aWJ1dGVzWzFdW3ZhbHVlXSINCg0Kbm8hISENCi0tMTA0ODY3MTZjNmY3NjRmNzMzODQ3MTZkMTZj
-      Y2VjOWQNCkNvbnRlbnQtRGlzcG9zaXRpb246IGZvcm0tZGF0YTsgbmFtZT0iYXZhdGFyIjsgZmls
-      ZW5hbWU9Im1hc3RvZG9ucHl1cGxvYWRfMTY2ODM0ODcyOS44NDU1Njg3Xzg2N2I4OTJiNDBiMDQ4
-      ZWU5ZWE3NDkwMzc4YjExZmEwLmpwZyINCkNvbnRlbnQtVHlwZTogaW1hZ2UvanBlZw0KDQr/2P/g
+      LS0wNDc4YjdmN2EwMmZhNzkwM2Q3YjRmNzRmYTI1YjI2Yg0KQ29udGVudC1EaXNwb3NpdGlvbjog
+      Zm9ybS1kYXRhOyBuYW1lPSJkaXNwbGF5X25hbWUiDQoNCkpvaG4gTGVubm9uDQotLTA0NzhiN2Y3
+      YTAyZmE3OTAzZDdiNGY3NGZhMjViMjZiDQpDb250ZW50LURpc3Bvc2l0aW9uOiBmb3JtLWRhdGE7
+      IG5hbWU9Im5vdGUiDQoNCkkgd2FsayBmdW5ueQ0KLS0wNDc4YjdmN2EwMmZhNzkwM2Q3YjRmNzRm
+      YTI1YjI2Yg0KQ29udGVudC1EaXNwb3NpdGlvbjogZm9ybS1kYXRhOyBuYW1lPSJmaWVsZHNfYXR0
+      cmlidXRlc1swXVtuYW1lXSINCg0KYnJlYWQNCi0tMDQ3OGI3ZjdhMDJmYTc5MDNkN2I0Zjc0ZmEy
+      NWIyNmINCkNvbnRlbnQtRGlzcG9zaXRpb246IGZvcm0tZGF0YTsgbmFtZT0iZmllbGRzX2F0dHJp
+      YnV0ZXNbMF1bdmFsdWVdIg0KDQp0b2FzdHkuDQotLTA0NzhiN2Y3YTAyZmE3OTAzZDdiNGY3NGZh
+      MjViMjZiDQpDb250ZW50LURpc3Bvc2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9ImZpZWxkc19hdHRy
+      aWJ1dGVzWzFdW25hbWVdIg0KDQpsYXNhZ25hDQotLTA0NzhiN2Y3YTAyZmE3OTAzZDdiNGY3NGZh
+      MjViMjZiDQpDb250ZW50LURpc3Bvc2l0aW9uOiBmb3JtLWRhdGE7IG5hbWU9ImZpZWxkc19hdHRy
+      aWJ1dGVzWzFdW3ZhbHVlXSINCg0Kbm8hISENCi0tMDQ3OGI3ZjdhMDJmYTc5MDNkN2I0Zjc0ZmEy
+      NWIyNmINCkNvbnRlbnQtRGlzcG9zaXRpb246IGZvcm0tZGF0YTsgbmFtZT0iYXZhdGFyIjsgZmls
+      ZW5hbWU9Im1hc3RvZG9ucHl1cGxvYWRfMTY2ODM1Njk4My44NjA2ODU2XzgzZmQxM2ZhODViNzRk
+      YmY4NTE3ZjNhZTlkYTM3ZWNjLmpwZyINCkNvbnRlbnQtVHlwZTogaW1hZ2UvanBlZw0KDQr/2P/g
       ABBKRklGAAEBAQBIAEgAAP/iAhxJQ0NfUFJPRklMRQABAQAAAgxsY21zAhAAAG1udHJSR0IgWFla
       IAfcAAEAGQADACkAOWFjc3BBUFBMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMt
       bGNtcwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACmRlc2MA
@@ -951,10 +951,10 @@ interactions:
       DAphpUqKI6mINwj9YYOV2oMLkmWXo9TfelSoHhykWUoovQTO33qdoivLumOvT8UqVFWbbHaEokDt
       zf5qMy4XCMTEjfPbPilSoFOFzByxzhRey1WUSaxVdtqVKgaCiiCrnK5pkwMTGX4pUqBTtsYnLjJ4
       xUrWDGZB1d1z+KVKguWW3ctzMCb7u1NAIwEky3zsvWlSoIzwuWI/YpgkyI8qxk4wZ/WlSoGNPcbo
-      46Oebs70qVKg/9kNCi0tMTA0ODY3MTZjNmY3NjRmNzMzODQ3MTZkMTZjY2VjOWQNCkNvbnRlbnQt
+      46Oebs70qVKg/9kNCi0tMDQ3OGI3ZjdhMDJmYTc5MDNkN2I0Zjc0ZmEyNWIyNmINCkNvbnRlbnQt
       RGlzcG9zaXRpb246IGZvcm0tZGF0YTsgbmFtZT0iaGVhZGVyIjsgZmlsZW5hbWU9Im1hc3RvZG9u
-      cHl1cGxvYWRfMTY2ODM0ODcyOS44NDc1ODYyXzU1ZTI0ZjNiMWJlOTQxOTJiZTNhZWM2ZjAzYmEx
-      Mzg2LmpwZyINCkNvbnRlbnQtVHlwZTogaW1hZ2UvanBlZw0KDQr/2P/gABBKRklGAAEBAQBIAEgA
+      cHl1cGxvYWRfMTY2ODM1Njk4My44NjI2MzQ0XzkzMjAxOTRhODVjNjQxNGJhZDcyYzI5MGI3NTNk
+      MmNkLmpwZyINCkNvbnRlbnQtVHlwZTogaW1hZ2UvanBlZw0KDQr/2P/gABBKRklGAAEBAQBIAEgA
       AP/iAhxJQ0NfUFJPRklMRQABAQAAAgxsY21zAhAAAG1udHJSR0IgWFlaIAfcAAEAGQADACkAOWFj
       c3BBUFBMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD21gABAAAAANMtbGNtcwAAAAAAAAAAAAAA
       AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACmRlc2MAAAD8AAAAXmNwcnQAAAFc
@@ -1890,7 +1890,7 @@ interactions:
       2oMLkmWXo9TfelSoHhykWUoovQTO33qdoivLumOvT8UqVFWbbHaEokDtzf5qMy4XCMTEjfPbPilS
       oFOFzByxzhRey1WUSaxVdtqVKgaCiiCrnK5pkwMTGX4pUqBTtsYnLjJ4xUrWDGZB1d1z+KVKguWW
       3ctzMCb7u1NAIwEky3zsvWlSoIzwuWI/YpgkyI8qxk4wZ/WlSoGNPcbo46Oebs70qVKg/9kNCi0t
-      MTA0ODY3MTZjNmY3NjRmNzMzODQ3MTZkMTZjY2VjOWQtLQ0K
+      MDQ3OGI3ZjdhMDJmYTc5MDNkN2I0Zjc0ZmEyNWIyNmItLQ0K
     headers:
       Accept:
       - '*/*'
@@ -1903,16 +1903,16 @@ interactions:
       Content-Length:
       - '107709'
       Content-Type:
-      - multipart/form-data; boundary=10486716c6f764f73384716d16ccec9d
+      - multipart/form-data; boundary=0478b7f7a02fa7903d7b4f74fa25b26b
       User-Agent:
       - tests/v311
     method: PATCH
     uri: http://localhost:3000/api/v1/accounts/update_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/4966966148e0c13b.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/899/193/569/236/original/4966966148e0c13b.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/399cc8f1613f6995.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/899/193/569/236/original/399cc8f1613f6995.jpg","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":null,"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/56a12900fea549d1.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/337/440/686/176/140/original/56a12900fea549d1.jpg","header":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/847b96c84f895fcc.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/337/440/686/176/140/original/847b96c84f895fcc.jpg","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":null,"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:
@@ -1920,7 +1920,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-1kz7sheDB1JGjrHk5STiUw=='';
+        style-src ''self'' http://localhost:3000 ''nonce-whBzkzAQaaI6WojWVVpAOw=='';
         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
@@ -1930,7 +1930,7 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       ETag:
-      - W/"4a6d0d7d623fd9780348d0505e130fca"
+      - W/"2ff10baeb96606520bf71cf29443cd4e"
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Transfer-Encoding:
@@ -1946,9 +1946,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 354d9e59-5bec-4001-b443-8fcd5c366a62
+      - 68ec8473-5cfc-401c-9ff1-46eee689d2f3
       X-Runtime:
-      - '0.072245'
+      - '0.081134'
       X-XSS-Protection:
       - 1; mode=block
     status: