From b1e1ec7bdc9e84ecd31626f1a4fbf645e84d0bb2 Mon Sep 17 00:00:00 2001 From: halcy Date: Sun, 13 Nov 2022 15:33:10 +0200 Subject: Add support for timed mutes, fix tests to actually pass with new setup --- tests/cassettes/test_stream_user_local.yaml | 63 ++++++++++++++++------------- 1 file changed, 34 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 58d344d..52e09dc 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":"109321664540352180","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-10T00: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":22,"last_status_at":"2022-11-10","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":"109336623096259500","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-gkwjYq+LCb/KEMV2NxbshQ==''; + style-src ''self'' http://localhost:3000 ''nonce-Boi4shZNlDsE/g0HccSQhw==''; 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/"fb81371f967af73d437fca77518c5b76" + - W/"80d63625bd23e8fc4a88c4c4a0159382" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -49,9 +49,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - f17baa84-2686-4fd4-8098-b47257ff4139 + - 02f7c304-d54c-4146-8121-c2d1c1122a39 X-Runtime: - - '0.013590' + - '0.012298' X-XSS-Protection: - 1; mode=block status: @@ -73,17 +73,18 @@ interactions: User-Agent: - tests/v311 method: POST - uri: http://localhost:3000/api/v1/accounts/109321664540352180/unfollow + uri: http://localhost:3000/api/v1/accounts/109336623096259500/unfollow response: body: - string: '{"id":"109321664540352180","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":"109336623096259500","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: - 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-ZrD+6y9sHNRbW9L/VrsA3A==''; + style-src ''self'' http://localhost:3000 ''nonce-IpxvPfKVN56VLw5Rnhj0bg==''; 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 @@ -93,7 +94,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"11435fd0c88c7540ef53a1ce0f924077" + - W/"fc5fa4da9317772baa3b6968b8c31a68" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -109,9 +110,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 1139f40e-3a65-4b56-803a-e51fac46dd69 + - 8101e209-0707-4856-956c-8ca28cb46a78 X-Runtime: - - '0.018744' + - '0.012317' X-XSS-Protection: - 1; mode=block status: @@ -134,14 +135,14 @@ interactions: uri: http://localhost:3000/api/v1/instance/ response: body: - string: '{"uri":"localhost:3000","title":"Mastodon","short_description":"","description":"","email":"","version":"4.0.0rc2","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":4,"status_count":25,"domain_count":0},"thumbnail":"http://localhost:3000/packs/media/images/preview-6399aebd96ccf025654e2977454f168f.png","languages":["en"],"registrations":true,"approval_required":false,"invites_enabled":true,"configuration":{"accounts":{"max_featured_tags":10},"statuses":{"max_characters":500,"max_media_attachments":4,"characters_reserved_per_url":23},"media_attachments":{"supported_mime_types":["image/jpeg","image/png","image/gif","image/heic","image/heif","image/webp","image/avif","video/webm","video/mp4","video/quicktime","video/ogg","audio/wave","audio/wav","audio/x-wav","audio/x-pn-wave","audio/vnd.wave","audio/ogg","audio/vorbis","audio/mpeg","audio/mp3","audio/webm","audio/flac","audio/aac","audio/m4a","audio/x-m4a","audio/mp4","audio/3gpp","video/x-ms-asf"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":2304000},"polls":{"max_options":4,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"contact_account":null,"rules":[]}' + string: '{"uri":"localhost:3000","title":"Mastodon","short_description":"","description":"","email":"","version":"4.0.0rc2","urls":{"streaming_api":"ws://localhost:4000"},"stats":{"user_count":4,"status_count":5,"domain_count":0},"thumbnail":"http://localhost:3000/packs/media/images/preview-6399aebd96ccf025654e2977454f168f.png","languages":["en"],"registrations":true,"approval_required":false,"invites_enabled":true,"configuration":{"accounts":{"max_featured_tags":10},"statuses":{"max_characters":500,"max_media_attachments":4,"characters_reserved_per_url":23},"media_attachments":{"supported_mime_types":["image/jpeg","image/png","image/gif","image/heic","image/heif","image/webp","image/avif","video/webm","video/mp4","video/quicktime","video/ogg","audio/wave","audio/wav","audio/x-wav","audio/x-pn-wave","audio/vnd.wave","audio/ogg","audio/vorbis","audio/mpeg","audio/mp3","audio/webm","audio/flac","audio/aac","audio/m4a","audio/x-m4a","audio/mp4","audio/3gpp","video/x-ms-asf"],"image_size_limit":10485760,"image_matrix_limit":16777216,"video_size_limit":41943040,"video_frame_rate_limit":60,"video_matrix_limit":2304000},"polls":{"max_options":4,"max_characters_per_option":50,"min_expiration":300,"max_expiration":2629746}},"contact_account":null,"rules":[]}' headers: Cache-Control: - max-age=180, public 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-xkJypL9JuaLYvngaT4wIJQ==''; + style-src ''self'' http://localhost:3000 ''nonce-hDMabuLdW+LHewXXmET0rg==''; 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 @@ -151,9 +152,9 @@ interactions: Content-Type: - application/json; charset=utf-8 Date: - - Thu, 10 Nov 2022 22:12:27 GMT + - Sun, 13 Nov 2022 13:16:08 GMT ETag: - - W/"e3dde204cfeb9d08fe78e070bae4265e" + - W/"58e74f5c697f043d86089eae87509b84" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -169,9 +170,9 @@ interactions: X-Permitted-Cross-Domain-Policies: - none X-Request-Id: - - 6166daa3-5622-4750-aac3-02321bca018d + - 1c0e5a7a-805c-49a4-9b48-682e8228bbdf X-Runtime: - - '0.015218' + - '0.013507' X-XSS-Protection: - 1; mode=block status: @@ -198,16 +199,18 @@ interactions: uri: http://localhost:3000/api/v1/statuses response: body: - string: '{"id":"109321804346504390","created_at":"2022-11-10T22:12:32.457Z","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/109321804346504390","url":"http://localhost:3000/@mastodonpy_test/109321804346504390","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":"109336682422462377","created_at":"2022-11-13T13:16:13.878Z","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/109336682422462377","url":"http://localhost:3000/@mastodonpy_test/109336682422462377","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":"109321664748836260","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-10T00:00:00.000Z","note":"","url":"http://localhost:3000/@mastodonpy_test","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":4,"last_status_at":"2022-11-10","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null}' + test suite","website":null},"account":{"id":"109336623311102204","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/623/311/102/204/original/8f758332953652da.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/623/311/102/204/original/8f758332953652da.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/623/311/102/204/original/c7470bf076df1e55.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/623/311/102/204/original/c7470bf076df1e55.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-6xu0+GdCnFJ8gnEdnw9RbA==''; + style-src ''self'' http://localhost:3000 ''nonce-uTSpou6BI8iRYNcyFoLJ2Q==''; 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 @@ -217,7 +220,7 @@ interactions: Content-Type: - application/json; charset=utf-8 ETag: - - W/"a8fa87cb101679d598c1fc7e34d1d7fc" + - W/"cf7299c13c61365ed015476697c9aab0" Referrer-Policy: - strict-origin-when-cross-origin Transfer-Encoding: @@ -235,13 +238,13 @@ interactions: X-RateLimit-Limit: - '300' X-RateLimit-Remaining: - - '286' + - '199' X-RateLimit-Reset: - - '2022-11-11T00:00:00.480143Z' + - '2022-11-13T15:00:00.908000Z' X-Request-Id: - - 6bd9e7dd-82ab-4022-8820-7f8db9ae163e + - f44e102f-a6f6-4778-a2e9-3a77afd6f936 X-Runtime: - - '0.037645' + - '0.042504' X-XSS-Protection: - 1; mode=block status: @@ -268,8 +271,10 @@ interactions: event: update - data: {"id":"109321804346504390","created_at":"2022-11-10T22:12:32.457Z","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/109321804346504390","url":"http://localhost:3000/@mastodonpy_test/109321804346504390","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":"109321664748836260","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"","locked":true,"bot":false,"discoverable":null,"group":false,"created_at":"2022-11-10T00:00:00.000Z","note":"","url":"http://localhost:3000/@mastodonpy_test","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":4,"last_status_at":"2022-11-10","noindex":false,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[],"card":null,"poll":null,"favourited":false,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"filtered":[]} + data: {"id":"109336682422462377","created_at":"2022-11-13T13:16:13.878Z","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/109336682422462377","url":"http://localhost:3000/@mastodonpy_test/109336682422462377","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":"109336623311102204","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/623/311/102/204/original/8f758332953652da.jpg","avatar_static":"http://localhost:3000/system/accounts/avatars/109/336/623/311/102/204/original/8f758332953652da.jpg","header":"http://localhost:3000/system/accounts/headers/109/336/623/311/102/204/original/c7470bf076df1e55.jpg","header_static":"http://localhost:3000/system/accounts/headers/109/336/623/311/102/204/original/c7470bf076df1e55.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":[]} :' @@ -287,7 +292,7 @@ interactions: Content-Type: - text/event-stream Date: - - Thu, 10 Nov 2022 22:12:27 GMT + - Sun, 13 Nov 2022 13:16:08 GMT Keep-Alive: - timeout=5 Transfer-Encoding: @@ -295,7 +300,7 @@ interactions: X-Powered-By: - Express X-Request-Id: - - 9197ae8e-a5c9-4173-8794-83baf5eb3a64 + - 6bce91bd-e963-4422-8754-d422f42568a1 status: code: 200 message: OK -- cgit v1.2.3