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_notifications_dismiss.yaml | 58 ++++++++++++------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'tests/cassettes/test_notifications_dismiss.yaml') diff --git a/tests/cassettes/test_notifications_dismiss.yaml b/tests/cassettes/test_notifications_dismiss.yaml index fea9589..aaf0173 100644 --- a/tests/cassettes/test_notifications_dismiss.yaml +++ b/tests/cassettes/test_notifications_dismiss.yaml @@ -20,18 +20,18 @@ interactions: uri: http://localhost:3000/api/v1/statuses response: body: - string: '{"id":"109336906360544222","created_at":"2022-11-13T14:13:10.902Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/admin/statuses/109336906360544222","url":"http://localhost:3000/@admin/109336906360544222","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003e\u003cspan + string: '{"id":"109337447098023048","created_at":"2022-11-13T16:30:41.908Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/admin/statuses/109337447098023048","url":"http://localhost:3000/@admin/109337447098023048","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"\u003cp\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:3000/@mastodonpy_test\" class=\"u-url mention\"\u003e@\u003cspan\u003emastodonpy_test\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e hello!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py - test suite","website":null},"account":{"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":1,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"109336899193569236","username":"mastodonpy_test","url":"http://localhost:3000/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}' + test suite","website":null},"account":{"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":1,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"109337440686176140","username":"mastodonpy_test","url":"http://localhost:3000/@mastodonpy_test","acct":"mastodonpy_test"}],"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-XUgceodvIxMABL82T9BRpQ==''; + style-src ''self'' http://localhost:3000 ''nonce-KWAcDLIm1QAOsknIlRek4Q==''; 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 @@ -41,7 +41,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"da33b3e01aafabf4e6a2264e43e0c6bb" + - W/"4c887e85b8805bda1be504666a7996a1" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -61,11 +61,11 @@ interactions: X-RateLimit-Remaining: - '296' X-RateLimit-Reset: - - '2022-11-13T15:00:00.933053Z' + - '2022-11-13T18:00:00.938062Z' X-Request-Id: - - 034d9ad9-531b-49b9-8fd4-0b73beeea917 + - d14e7a6a-c168-477d-ab2b-a30778c3f18f X-Runtime: - - '0.043057' + - '0.048632' X-XSS-Protection: - 1; mode=block status: @@ -88,18 +88,18 @@ interactions: uri: http://localhost:3000/api/v1/notifications response: body: - string: '[{"id":"16","type":"mention","created_at":"2022-11-13T14:13:10.993Z","account":{"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":1,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"status":{"id":"109336906360544222","created_at":"2022-11-13T14:13:10.902Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/admin/statuses/109336906360544222","url":"http://localhost:3000/@admin/109336906360544222","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"content":"\u003cp\u003e\u003cspan + string: '[{"id":"18","type":"mention","created_at":"2022-11-13T16:30:42.008Z","account":{"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":1,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"status":{"id":"109337447098023048","created_at":"2022-11-13T16:30:41.908Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/admin/statuses/109337447098023048","url":"http://localhost:3000/@admin/109337447098023048","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"content":"\u003cp\u003e\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:3000/@mastodonpy_test\" class=\"u-url mention\"\u003e@\u003cspan\u003emastodonpy_test\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e hello!\u003c/p\u003e","filtered":[],"reblog":null,"application":{"name":"Mastodon.py - test suite","website":null},"account":{"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":1,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"109336899193569236","username":"mastodonpy_test","url":"http://localhost:3000/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}},{"id":"12","type":"follow","created_at":"2022-11-13T14:12:39.955Z","account":{"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":1,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[]}}]' + test suite","website":null},"account":{"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":1,"last_status_at":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"109337440686176140","username":"mastodonpy_test","url":"http://localhost:3000/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}},{"id":"14","type":"follow","created_at":"2022-11-13T16:30:10.884Z","account":{"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":1,"last_status_at":"2022-11-13","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-mIYwrVZFvMkxUMHAU4eWLA==''; + style-src ''self'' http://localhost:3000 ''nonce-bHGp4zDLLWsvCFcPZVyVPQ==''; 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,9 +109,9 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"27aabd9a3eab6f690a5e9534be20e48a" + - W/"95739ef236b57de03146c06d3ad78a2d" Link: - - ; rel="next", ; + - ; rel="next", ; rel="prev" Referrer-Policy: - strict-origin-when-cross-origin @@ -128,9 +128,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 1d191f23-f06e-4896-a983-0627cb886623 + - 87caff33-d7b6-425c-b63f-873e5afd1580 X-Runtime: - - '0.025512' + - '0.026539' X-XSS-Protection: - 1; mode=block status: @@ -160,7 +160,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-XSv1CnS88Dko72yK/13U9g==''; + style-src ''self'' http://localhost:3000 ''nonce-8ZURkOwraQKVdEIC1Hmrvw==''; 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 Date: - - Sun, 13 Nov 2022 14:13:13 GMT + - Sun, 13 Nov 2022 16:30:44 GMT ETag: - W/"44cfc5adcf2f4e5c6e5bb3be5680f119" Referrer-Policy: @@ -188,9 +188,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 10c00fdc-3d13-489d-9f69-0e6baf0ea1ed + - 7039682a-eebe-46f1-836f-91c2485243f5 X-Runtime: - - '0.012861' + - '0.015335' X-XSS-Protection: - 1; mode=block status: @@ -212,7 +212,7 @@ interactions: User-Agent: - tests/v311 method: POST - uri: http://localhost:3000/api/v1/notifications/16/dismiss + uri: http://localhost:3000/api/v1/notifications/18/dismiss response: body: string: '{}' @@ -222,7 +222,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-BgZYS8o4SPCdAGABGX6zmg==''; + style-src ''self'' http://localhost:3000 ''nonce-iSHvB/Epkfxt3johq6T9XA==''; 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 @@ -248,9 +248,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 6ff0a0fa-089b-44a1-8fb4-56e78644878b + - 83b9e857-4246-49f0-baf8-948d81405662 X-Runtime: - - '0.010451' + - '0.019802' X-XSS-Protection: - 1; mode=block status: @@ -272,19 +272,19 @@ interactions: User-Agent: - tests/v311 method: DELETE - uri: http://localhost:3000/api/v1/statuses/109336906360544222 + uri: http://localhost:3000/api/v1/statuses/109337447098023048 response: body: - string: '{"id":"109336906360544222","created_at":"2022-11-13T14:13:10.902Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/admin/statuses/109336906360544222","url":"http://localhost:3000/@admin/109336906360544222","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"@mastodonpy_test + string: '{"id":"109337447098023048","created_at":"2022-11-13T16:30:41.908Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:3000/users/admin/statuses/109337447098023048","url":"http://localhost:3000/@admin/109337447098023048","replies_count":0,"reblogs_count":0,"favourites_count":0,"edited_at":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"text":"@mastodonpy_test hello!","filtered":[],"reblog":null,"application":{"name":"Mastodon.py test - suite","website":null},"account":{"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":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"109336899193569236","username":"mastodonpy_test","url":"http://localhost:3000/@mastodonpy_test","acct":"mastodonpy_test"}],"tags":[],"emojis":[],"card":null,"poll":null}' + suite","website":null},"account":{"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":"2022-11-13","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[{"id":"109337440686176140","username":"mastodonpy_test","url":"http://localhost:3000/@mastodonpy_test","acct":"mastodonpy_test"}],"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-ZP/Q672PkmYUrgWJI08bBw==''; + style-src ''self'' http://localhost:3000 ''nonce-68PklxI8YluDLPUMdilahQ==''; 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 @@ -294,7 +294,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"139e4ad6db08163b4ecf7954d09e13d5" + - W/"bf5fe15510de742a4c6cd0822ac18a7a" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -310,9 +310,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - ee78242f-954e-413c-bc36-1476afba2bc3 + - b2693cc8-a510-4aea-bfbf-2b22ad7b6d60 X-Runtime: - - '0.023622' + - '0.025688' X-XSS-Protection: - 1; mode=block status: -- cgit v1.2.3