From 5215c2242dd7b87418a7c10781c2b10b35d86f46 Mon Sep 17 00:00:00 2001 From: halcy Date: Sun, 13 Nov 2022 18:39:56 +0200 Subject: Fix some things in streaming and admin API for 3.3.0 support --- tests/cassettes/test_stream_user_local.yaml | 58 ++++++++++++++--------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'tests/cassettes/test_stream_user_local.yaml') diff --git a/tests/cassettes/test_stream_user_local.yaml b/tests/cassettes/test_stream_user_local.yaml index 0b5c37c..1cd6d1b 100644 --- a/tests/cassettes/test_stream_user_local.yaml +++ b/tests/cassettes/test_stream_user_local.yaml @@ -16,14 +16,14 @@ interactions: uri: http://localhost:3000/api/v1/accounts/verify_credentials 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":3,"last_status_at":"2022-11-13","noindex":false,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[],"follow_requests_count":0},"emojis":[],"fields":[],"role":{"id":"3","name":"Owner","permissions":"1048575","color":"","highlighted":true}}' + 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":3,"last_status_at":"2022-11-13","noindex":false,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[],"follow_requests_count":0},"emojis":[],"fields":[],"role":{"id":"3","name":"Owner","permissions":"1048575","color":"","highlighted":true}}' 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-Q9UZ4dfGxwziiKThQBuI6Q==''; + style-src ''self'' http://localhost:3000 ''nonce-IwEDrmq092eoStlXIf6S8Q==''; 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/"385c323c77da241c3949cc41734d518f" + - W/"665248d4dae03f657af46ac2b7465449" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -49,9 +49,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 076624f0-4464-4e2f-8569-06463e52604b + - c040ea19-bfd2-4a05-a829-092e97be1fbe X-Runtime: - - '0.012866' + - '0.012289' X-XSS-Protection: - 1; mode=block status: @@ -73,10 +73,10 @@ 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":"top + 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":"top ebayer gerne wieder"}' headers: Cache-Control: @@ -84,7 +84,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-5TMMUzUG5PgYfCG/vPBqAA==''; + style-src ''self'' http://localhost:3000 ''nonce-0/6pdJ+kAPBcxStoK44Dig==''; 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 @@ -94,7 +94,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"a58b6931bdf80070edebc5580f3ddc28" + - W/"d7e89095e63ccdec6921fcd4a7c80890" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -110,9 +110,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 343301cc-716b-4c77-a9ab-d23175d17ed4 + - 30a4caad-05f5-42ef-a93d-52e8be10f8a6 X-Runtime: - - '0.011816' + - '0.012090' X-XSS-Protection: - 1; mode=block status: @@ -142,7 +142,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-kLEMNAekKcpCwHLcD0xXFQ==''; + style-src ''self'' http://localhost:3000 ''nonce-RfWsDuz9NsebEDrpog/5bg==''; 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 @@ -152,7 +152,7 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Sun, 13 Nov 2022 14:13:57 GMT + - Sun, 13 Nov 2022 16:31:27 GMT ETag: - W/"58e74f5c697f043d86089eae87509b84" Referrer-Policy: @@ -170,9 +170,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 2396fe81-f27c-4328-aab1-7e69a6112702 + - e565f179-b522-44a5-aa64-c47788f61d11 X-Runtime: - - '0.013565' + - '0.020684' X-XSS-Protection: - 1; mode=block status: @@ -199,18 +199,18 @@ interactions: uri: http://localhost:3000/api/v1/statuses response: body: - string: '{"id":"109336909747013952","created_at":"2022-11-13T14:14:02.577Z","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/109336909747013952","url":"http://localhost:3000/@mastodonpy_test/109336909747013952","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eit\u0026#39;s + string: '{"id":"109337450437842705","created_at":"2022-11-13T16:31:32.863Z","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/109337450437842705","url":"http://localhost:3000/@mastodonpy_test/109337450437842705","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003eit\u0026#39;s cool guy\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":3,"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":3,"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-zLai6XBjoGRUVmphN54+nw==''; + style-src ''self'' http://localhost:3000 ''nonce-XvU5As5+p9S3Ci+d6vga2w==''; 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 @@ -220,7 +220,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"4384511f0591a6842aa6ee7a21654053" + - W/"eb1c038a190fdfb46f2c297eadaebe00" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -238,13 +238,13 @@ interactions: X-RateLimit-Limit: - '300' X-RateLimit-Remaining: - - '199' + - '197' X-RateLimit-Reset: - - '2022-11-13T15:00:00.606711Z' + - '2022-11-13T18:00:00.893573Z' X-Request-Id: - - 5b13eecd-383d-4a58-b387-6bf0634b845f + - fa433c81-effd-427f-8e32-c3d495289f14 X-Runtime: - - '0.043063' + - '0.043170' X-XSS-Protection: - 1; mode=block status: @@ -271,10 +271,10 @@ interactions: event: update - data: {"id":"109336909747013952","created_at":"2022-11-13T14:14:02.577Z","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/109336909747013952","url":"http://localhost:3000/@mastodonpy_test/109336909747013952","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"content":"

it's - cool guy

","reblog":null,"application":{"name":"Mastodon.py test suite","website":null},"account":{"id":"109336899193569236","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John + data: {"id":"109337450437842705","created_at":"2022-11-13T16:31:32.863Z","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/109337450437842705","url":"http://localhost:3000/@mastodonpy_test/109337450437842705","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"content":"

it's + cool guy

","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":"

I - walk funny

","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":3,"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,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"filtered":[]} + walk funny

","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":3,"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,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"filtered":[]} :' @@ -292,7 +292,7 @@ interactions: Content-Type: - text/event-stream Date: - - Sun, 13 Nov 2022 14:13:57 GMT + - Sun, 13 Nov 2022 16:31:27 GMT Keep-Alive: - timeout=5 Transfer-Encoding: @@ -300,7 +300,7 @@ interactions: X-Powered-By: - Express X-Request-Id: - - 8e8cb552-84c7-4858-bb8b-5938ed458b09 + - 07c53d00-56da-462a-b963-06d97fa6083c status: code: 200 message: OK -- cgit v1.2.3