diff --git a/docs/index.rst b/docs/index.rst index 1f8b279..e1dc7ac 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -378,8 +378,7 @@ Filter dicts 'context': # List of places where the filters are applied ('home', 'notifications', 'public', 'thread') 'expires_at': # Expiry date for the filter 'irreversible': # Boolean denoting if this filter is executed server-side - # or if it should be ran client-side (Note that Mastodon.py does - # not run client-side filters for you). + # or if it should be ran client-side. 'whole_word': # Boolean denoting whether this filter can match partial words } @@ -946,4 +945,4 @@ about who helped with which particular feature or fix in the changelog. .. _Mastodon: https://github.com/tootsuite/mastodon .. _Mastodon flagship instance: http://mastodon.social/ -.. _Mastodon api docs: https://github.com/tootsuite/documentation/ \ No newline at end of file +.. _Mastodon api docs: https://github.com/tootsuite/documentation/ diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py index bb7ef31..f524c61 100644 --- a/mastodon/Mastodon.py +++ b/mastodon/Mastodon.py @@ -1497,15 +1497,14 @@ class Mastodon: # Writing data: Keyword filters ### @api_version("2.4.3", "2.4.3", __DICT_VERSION_FILTER) - def filter_create(phrase, context, irreversible = True, whole_word = True, expires_in = None): + def filter_create(phrase, context, irreversible = False, whole_word = True, expires_in = None): """ Creates a new keyword filter. `phrase` is the phrase that should be filtered out, `context` specifies from where to filter the keywords. Valid contexts are 'home', 'notifications', 'public' and 'thread'. - Set `irreversible` to False if you want the filter to merely be applied - at client side. Note that Mastodon.py doesn't do any client-side - filtering for you. + Set `irreversible` to True if you want the filter to just delete statuses + server side. This works only for the 'home' and 'notifications' contexts. Set `whole_word` to False if you want to allow filter matches to start or end within a word, not only at word boundaries. diff --git a/tests/cassettes/test_account_follow_unfollow.yaml b/tests/cassettes/test_account_follow_unfollow.yaml index ff72257..db8abd3 100644 --- a/tests/cassettes/test_account_follow_unfollow.yaml +++ b/tests/cassettes/test_account_follow_unfollow.yaml @@ -1,21 +1,22 @@ interactions: - request: - body: null + body: reblogs=True&id=1 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['17'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1/follow response: - body: {string: '{"id":"1","following":true,"showing_reblogs":false,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} + body: {string: '{"id":"1","following":true,"showing_reblogs":true,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"2aac633ba6c8db22698d7975d76a2350"] + ETag: [W/"da231c42e4f93811b1967ba204ea1826"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -23,10 +24,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [133f29cb-6a3a-486f-9b2a-745b0439a8ad] - X-Runtime: ['0.068733'] + X-Request-Id: [58de6ff4-5b4d-40ff-acfc-cbacec164fba] + X-Runtime: ['0.133648'] X-XSS-Protection: [1; mode=block] - content-length: ['174'] + content-length: ['173'] status: {code: 200, message: OK} - request: body: null @@ -44,7 +45,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"567fcb76cedd3fab2d295958338f60e1"] + ETag: [W/"aa5045a7c507295fb5399be2a201fd0a"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -52,8 +53,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [18d3baab-c960-4eb9-842f-8e9a8be1bcd5] - X-Runtime: ['0.075583'] + X-Request-Id: [6500e743-3e55-4931-a7de-3433017b2892] + X-Runtime: ['0.117442'] X-XSS-Protection: [1; mode=block] content-length: ['175'] status: {code: 200, message: OK} diff --git a/tests/cassettes/test_account_search.yaml b/tests/cassettes/test_account_search.yaml index 78f20e8..b8698c5 100644 --- a/tests/cassettes/test_account_search.yaml +++ b/tests/cassettes/test_account_search.yaml @@ -10,11 +10,11 @@ interactions: method: GET uri: http://localhost:3000/api/v1/accounts/search?q=admin response: - body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"emojis":[],"fields":[]}]'} + body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"emojis":[],"fields":[]}]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"9ed38f78d86f3323e4d890f7fde996fe"] + ETag: [W/"db85ef2b54ebcf74ab2a62a3611b32f9"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -22,28 +22,29 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [7a7d43e4-0b13-4e23-aa34-560855b13366] - X-Runtime: ['0.028422'] + X-Request-Id: [d64736d5-872b-4576-a016-507e5a6210c9] + X-Runtime: ['0.593596'] X-XSS-Protection: [1; mode=block] - content-length: ['550'] + content-length: ['551'] status: {code: 200, message: OK} - request: - body: null + body: reblogs=True&id=1 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['17'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1/follow response: - body: {string: '{"id":"1","following":true,"showing_reblogs":false,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} + body: {string: '{"id":"1","following":true,"showing_reblogs":true,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"2aac633ba6c8db22698d7975d76a2350"] + ETag: [W/"73b11b0fc7e76756964f8713cfbd32d3"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -51,10 +52,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [de297198-591f-4e6e-8515-24f1b7741899] - X-Runtime: ['0.062917'] + X-Request-Id: [9d397398-5005-4e02-bb24-6be14263e449] + X-Runtime: ['0.281744'] X-XSS-Protection: [1; mode=block] - content-length: ['174'] + content-length: ['173'] status: {code: 200, message: OK} - request: body: null @@ -67,11 +68,11 @@ interactions: method: GET uri: http://localhost:3000/api/v1/accounts/search?following=True&q=admin response: - body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"emojis":[],"fields":[]}]'} + body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"emojis":[],"fields":[]}]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"6420365b0c00860d2adcedbe18d93c46"] + ETag: [W/"d684e220cc20b462f23ae1d44d5ef8e2"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -79,10 +80,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [9c9011c5-cc1b-40a4-9d1b-56f669adc944] - X-Runtime: ['0.035517'] + X-Request-Id: [e511d32a-a026-447c-b4c9-aa10bec732d7] + X-Runtime: ['0.057559'] X-XSS-Protection: [1; mode=block] - content-length: ['550'] + content-length: ['551'] status: {code: 200, message: OK} - request: body: null @@ -100,7 +101,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"567fcb76cedd3fab2d295958338f60e1"] + ETag: [W/"97b254dec020382a063f788a6984808f"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -108,8 +109,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [e9a45781-41e5-4184-86b3-bf528fd342df] - X-Runtime: ['0.045182'] + X-Request-Id: [1e249c7b-04fe-42d7-b6c6-330d072b38db] + X-Runtime: ['0.116435'] X-XSS-Protection: [1; mode=block] content-length: ['175'] status: {code: 200, message: OK} @@ -128,7 +129,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"573082b711c5e9cb9dfd1bef03d669a2"] + ETag: [W/"98911f27999fb7ceab3f494fc3157179"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -136,8 +137,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [1381d7b9-67d0-423c-82c8-91e34f24b010] - X-Runtime: ['0.021078'] + X-Request-Id: [c75c8037-cfe2-40f5-a780-f76fe720e6d0] + X-Runtime: ['0.066532'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -152,11 +153,11 @@ interactions: method: GET uri: http://localhost:3000/api/v1/accounts/search?q=admin response: - body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"emojis":[],"fields":[]}]'} + body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"emojis":[],"fields":[]}]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"9ed38f78d86f3323e4d890f7fde996fe"] + ETag: [W/"db85ef2b54ebcf74ab2a62a3611b32f9"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -164,9 +165,9 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [1dd3604c-c7d2-4938-8569-77c84b69b8b1] - X-Runtime: ['0.017571'] + X-Request-Id: [d2d1d56b-fd97-4998-b364-2a8c1d9e6e33] + X-Runtime: ['0.053387'] X-XSS-Protection: [1; mode=block] - content-length: ['550'] + content-length: ['551'] status: {code: 200, message: OK} version: 1 diff --git a/tests/cassettes/test_follow_request_authorize.yaml b/tests/cassettes/test_follow_request_authorize.yaml index 4499b6b..af531f6 100644 --- a/tests/cassettes/test_follow_request_authorize.yaml +++ b/tests/cassettes/test_follow_request_authorize.yaml @@ -1,12 +1,13 @@ interactions: - request: - body: null + body: reblogs=True&id=1234567890123456 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN_2] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['32'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1234567890123456/follow @@ -15,7 +16,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"3f1f0210e7ee7ff846ebc784ad5ad194"] + ETag: [W/"1b53bbbf2157ed6dfbc2ebff1bae575a"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -23,8 +24,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [15751ad2-d68e-4b74-8a2d-0100a50544e9] - X-Runtime: ['0.047205'] + X-Request-Id: [d825adf4-d39b-4b11-ac06-52f1c2ebae1e] + X-Runtime: ['0.167887'] X-XSS-Protection: [1; mode=block] content-length: ['188'] status: {code: 200, message: OK} @@ -44,7 +45,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"bfd3faa192e3a4b3c0dc9e2fe633c178"] + ETag: [W/"eaa50bd8a2a8ed6f27b526579722aa2b"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -52,8 +53,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [1dc7febe-b975-4165-8cf1-b42038e1b54a] - X-Runtime: ['0.070846'] + X-Request-Id: [e60c20e1-3f5a-482b-bd96-fe38751015cc] + X-Runtime: ['0.182601'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -73,7 +74,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"db9bafc9422fb3898eed6da5609c1305"] + ETag: [W/"f823a0cd20057f6ffc5edcb18fcdd541"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -81,8 +82,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [ffa515f3-8799-4927-97a7-e2d843cb13be] - X-Runtime: ['0.047887'] + X-Request-Id: [e12e2778-318b-442e-bfe0-ce3101c67a7b] + X-Runtime: ['0.139029'] X-XSS-Protection: [1; mode=block] content-length: ['190'] status: {code: 200, message: OK} diff --git a/tests/cassettes/test_follow_request_reject.yaml b/tests/cassettes/test_follow_request_reject.yaml index 916e792..d5087fa 100644 --- a/tests/cassettes/test_follow_request_reject.yaml +++ b/tests/cassettes/test_follow_request_reject.yaml @@ -1,12 +1,13 @@ interactions: - request: - body: null + body: reblogs=True&id=1234567890123456 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN_2] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['32'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1234567890123456/follow @@ -15,7 +16,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"3f1f0210e7ee7ff846ebc784ad5ad194"] + ETag: [W/"0e7326a77136d46511878c9fb203e88b"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -23,8 +24,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [fba6f898-6ea1-4de4-a063-a53643cfc286] - X-Runtime: ['0.042411'] + X-Request-Id: [ec1d931d-897e-4219-9fa1-6166bc762bfd] + X-Runtime: ['0.156235'] X-XSS-Protection: [1; mode=block] content-length: ['188'] status: {code: 200, message: OK} @@ -44,7 +45,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"bfd3faa192e3a4b3c0dc9e2fe633c178"] + ETag: [W/"cc038aae2038665db3b200fc78f63649"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -52,8 +53,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [258bc833-565f-486b-8eee-88838ed05f77] - X-Runtime: ['0.021558'] + X-Request-Id: [cb36e831-38d1-464f-a80a-6996a0e54290] + X-Runtime: ['0.026729'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} diff --git a/tests/cassettes/test_list_add_remove_account.yaml b/tests/cassettes/test_list_add_remove_account.yaml index 96d8eb0..c70cfd0 100644 --- a/tests/cassettes/test_list_add_remove_account.yaml +++ b/tests/cassettes/test_list_add_remove_account.yaml @@ -12,11 +12,11 @@ interactions: method: POST uri: http://localhost:3000/api/v1/lists response: - body: {string: '{"id":"8","title":"ham burglars"}'} + body: {string: '{"id":"11","title":"ham burglars"}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"fa515662bd5f01d24648b40d4019aad1"] + ETag: [W/"2e1510bf7e5d27be138dad5ee706a95c"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -24,10 +24,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [6f26ef1b-5e51-4cbd-b165-08bd0ba19035] - X-Runtime: ['0.024120'] + X-Request-Id: [ba3b9608-0492-4e9e-bf94-3c0cec978c5d] + X-Runtime: ['0.052839'] X-XSS-Protection: [1; mode=block] - content-length: ['33'] + content-length: ['34'] status: {code: 200, message: OK} - request: body: null @@ -40,11 +40,11 @@ interactions: method: GET uri: http://localhost:3000/api/v1/accounts/verify_credentials response: - body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[]},"emojis":[],"fields":[]}'} + body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[]},"emojis":[],"fields":[]}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"2c1db1f5c9c342772002bf0d4ff450ec"] + ETag: [W/"77222b64dac9878e096ec88200a8855c"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -52,28 +52,29 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [60e7b33d-da24-4ff7-8f2f-3264d837c2b6] - X-Runtime: ['0.018413'] + X-Request-Id: [6c72b0ad-2086-45ff-a7de-9fdf35686b8a] + X-Runtime: ['0.026289'] X-XSS-Protection: [1; mode=block] - content-length: ['634'] + content-length: ['635'] status: {code: 200, message: OK} - request: - body: null + body: reblogs=True&id=1 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['17'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1/follow response: - body: {string: '{"id":"1","following":true,"showing_reblogs":false,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} + body: {string: '{"id":"1","following":true,"showing_reblogs":true,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"6de77dd5834bb5fc499eed9cda4081de"] + ETag: [W/"8b9b4c18fc17527693bdad489048280a"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -81,10 +82,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [bd78a915-f029-4986-b952-dabd4dda120c] - X-Runtime: ['0.063270'] + X-Request-Id: [47c16f53-232d-46ae-aab6-5bc99c1b197b] + X-Runtime: ['0.075269'] X-XSS-Protection: [1; mode=block] - content-length: ['174'] + content-length: ['173'] status: {code: 200, message: OK} - request: body: account_ids%5B%5D=1 @@ -97,13 +98,13 @@ interactions: Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST - uri: http://localhost:3000/api/v1/lists/8/accounts + uri: http://localhost:3000/api/v1/lists/11/accounts response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"bf92612b432ba5b51a56b55e4c0b9817"] + ETag: [W/"cc038aae2038665db3b200fc78f63649"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -111,8 +112,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [f89cdcb6-0bd2-434f-83b1-5a285359bc30] - X-Runtime: ['0.047258'] + X-Request-Id: [06975fb9-7db6-4abc-9f2a-ef6527833977] + X-Runtime: ['0.132509'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -125,14 +126,14 @@ interactions: Connection: [keep-alive] User-Agent: [python-requests/2.18.4] method: GET - uri: http://localhost:3000/api/v1/lists/8/accounts + uri: http://localhost:3000/api/v1/lists/11/accounts response: - body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"emojis":[],"fields":[]}]'} + body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"emojis":[],"fields":[]}]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"a474745c1f57a6da8e80efa488b51726"] - Link: ['; rel="prev"'] + ETag: [W/"48e17006c2bcb847af7e9265b33f6bfc"] + Link: ['; rel="prev"'] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -140,10 +141,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [a5f30350-5070-4d6b-bf1f-b8a320da9f2a] - X-Runtime: ['0.018499'] + X-Request-Id: [f76e15ce-e515-45c9-96c3-92f7bd90fa99] + X-Runtime: ['0.053463'] X-XSS-Protection: [1; mode=block] - content-length: ['550'] + content-length: ['551'] status: {code: 200, message: OK} - request: body: null @@ -161,7 +162,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"8afbf44289c39f499be3ca55837eced5"] + ETag: [W/"c1bd0e2902322c7b40156adc012ff28e"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -169,8 +170,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [0f7ff949-22cd-4d68-92cc-90c7ee5c8dd8] - X-Runtime: ['0.049951'] + X-Request-Id: [07363229-165e-43e5-8f91-32d7fba50802] + X-Runtime: ['0.082557'] X-XSS-Protection: [1; mode=block] content-length: ['175'] status: {code: 200, message: OK} @@ -183,13 +184,13 @@ interactions: Connection: [keep-alive] User-Agent: [python-requests/2.18.4] method: GET - uri: http://localhost:3000/api/v1/lists/8/accounts + uri: http://localhost:3000/api/v1/lists/11/accounts response: body: {string: '[]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"d77e610161dd1bed88178cffc05bb02a"] + ETag: [W/"f82743b7a0062bbc98545212015cc152"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -197,28 +198,29 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [627eb941-8858-4548-9da8-a138a77ad8dc] - X-Runtime: ['0.023576'] + X-Request-Id: [db5b3eaa-19eb-42c2-8944-955f2ea1009a] + X-Runtime: ['0.052515'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} - request: - body: null + body: reblogs=True&id=1 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['17'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1/follow response: - body: {string: '{"id":"1","following":true,"showing_reblogs":false,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} + body: {string: '{"id":"1","following":true,"showing_reblogs":true,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"6de77dd5834bb5fc499eed9cda4081de"] + ETag: [W/"8b9b4c18fc17527693bdad489048280a"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -226,10 +228,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [0d1ce293-50c1-4294-b91e-a76cf5454494] - X-Runtime: ['0.071417'] + X-Request-Id: [ec06d458-e3c1-42b2-ada8-c8f9bb3dc5b9] + X-Runtime: ['0.134772'] X-XSS-Protection: [1; mode=block] - content-length: ['174'] + content-length: ['173'] status: {code: 200, message: OK} - request: body: account_ids%5B%5D=1 @@ -242,13 +244,13 @@ interactions: Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST - uri: http://localhost:3000/api/v1/lists/8/accounts + uri: http://localhost:3000/api/v1/lists/11/accounts response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"bf92612b432ba5b51a56b55e4c0b9817"] + ETag: [W/"0cdb2e7c6eb5550ff52103826ed9e2cd"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -256,8 +258,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [b8a42547-99e2-402b-8745-2f7c132dcca0] - X-Runtime: ['0.041756'] + X-Request-Id: [1dbf14ec-bd46-4d0c-a05f-e467cedf202f] + X-Runtime: ['0.061339'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -270,14 +272,14 @@ interactions: Connection: [keep-alive] User-Agent: [python-requests/2.18.4] method: GET - uri: http://localhost:3000/api/v1/lists/8/accounts + uri: http://localhost:3000/api/v1/lists/11/accounts response: - body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"emojis":[],"fields":[]}]'} + body: {string: '[{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"emojis":[],"fields":[]}]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"a474745c1f57a6da8e80efa488b51726"] - Link: ['; rel="prev"'] + ETag: [W/"3e75598a9b305d16f2618ab63ca1d6ad"] + Link: ['; rel="prev"'] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -285,10 +287,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [0f5df72d-97aa-4eea-8049-aa6c9bcb819d] - X-Runtime: ['0.017421'] + X-Request-Id: [226a577e-da14-4704-9dbc-030e01583697] + X-Runtime: ['0.041821'] X-XSS-Protection: [1; mode=block] - content-length: ['550'] + content-length: ['551'] status: {code: 200, message: OK} - request: body: account_ids%5B%5D=1 @@ -301,13 +303,13 @@ interactions: Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: DELETE - uri: http://localhost:3000/api/v1/lists/8/accounts + uri: http://localhost:3000/api/v1/lists/11/accounts response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"bf92612b432ba5b51a56b55e4c0b9817"] + ETag: [W/"0cdb2e7c6eb5550ff52103826ed9e2cd"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -315,8 +317,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [82e03414-ef8d-413f-8805-4bc9b49aef92] - X-Runtime: ['0.024025'] + X-Request-Id: [00b2aa70-ee0c-49e9-a9d4-8830f70a010d] + X-Runtime: ['0.056654'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -329,13 +331,13 @@ interactions: Connection: [keep-alive] User-Agent: [python-requests/2.18.4] method: GET - uri: http://localhost:3000/api/v1/lists/8/accounts + uri: http://localhost:3000/api/v1/lists/11/accounts response: body: {string: '[]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"d77e610161dd1bed88178cffc05bb02a"] + ETag: [W/"6fddf1677be1263a4a2fd127d789d19a"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -343,8 +345,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [bdc94f0f-6992-4c10-8b52-cdc10e876de9] - X-Runtime: ['0.021202'] + X-Request-Id: [6cf79d0c-2111-4260-a813-7584129f2ed5] + X-Runtime: ['0.047343'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -364,7 +366,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"8afbf44289c39f499be3ca55837eced5"] + ETag: [W/"72b6665162a1eb117de3887134c94c6d"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -372,8 +374,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [5d35fd25-ad27-4d3c-8188-fce3458621f1] - X-Runtime: ['0.044831'] + X-Request-Id: [0c0227f0-d6d0-4326-9fbd-609347c580cc] + X-Runtime: ['0.096583'] X-XSS-Protection: [1; mode=block] content-length: ['175'] status: {code: 200, message: OK} @@ -387,13 +389,13 @@ interactions: Content-Length: ['0'] User-Agent: [python-requests/2.18.4] method: DELETE - uri: http://localhost:3000/api/v1/lists/8 + uri: http://localhost:3000/api/v1/lists/11 response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"bf92612b432ba5b51a56b55e4c0b9817"] + ETag: [W/"0cdb2e7c6eb5550ff52103826ed9e2cd"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -401,8 +403,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [491e273f-5142-46a4-9718-23174c02ec15] - X-Runtime: ['0.021338'] + X-Request-Id: [4dd258a5-af4e-403e-ac35-3703e6428f76] + X-Runtime: ['0.064121'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} diff --git a/tests/cassettes/test_list_by_account.yaml b/tests/cassettes/test_list_by_account.yaml index 6340e83..d74accb 100644 --- a/tests/cassettes/test_list_by_account.yaml +++ b/tests/cassettes/test_list_by_account.yaml @@ -12,11 +12,11 @@ interactions: method: POST uri: http://localhost:3000/api/v1/lists response: - body: {string: '{"id":"9","title":"ham burglars"}'} + body: {string: '{"id":"12","title":"ham burglars"}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"0cfb62ec28516f1f944d1edde5fbaa35"] + ETag: [W/"9d25791829ea38f2ad58d7f62532e947"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -24,10 +24,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [e1f21d90-93e8-4014-bf33-a7cdc349e9aa] - X-Runtime: ['0.021446'] + X-Request-Id: [e66b2030-01e8-4ebf-9674-73adf96695df] + X-Runtime: ['0.043475'] X-XSS-Protection: [1; mode=block] - content-length: ['33'] + content-length: ['34'] status: {code: 200, message: OK} - request: body: null @@ -40,11 +40,11 @@ interactions: method: GET uri: http://localhost:3000/api/v1/accounts/verify_credentials response: - body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[]},"emojis":[],"fields":[]}'} + body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[]},"emojis":[],"fields":[]}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"2c1db1f5c9c342772002bf0d4ff450ec"] + ETag: [W/"5211bab11227593f32fe99dfc5c25984"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -52,28 +52,29 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [0047cb29-9a8b-472b-b820-b82e628d36c0] - X-Runtime: ['0.017867'] + X-Request-Id: [0ded0bcc-1c0d-447a-8f61-ed7192620979] + X-Runtime: ['0.277921'] X-XSS-Protection: [1; mode=block] - content-length: ['634'] + content-length: ['635'] status: {code: 200, message: OK} - request: - body: null + body: reblogs=True&id=1 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['17'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1/follow response: - body: {string: '{"id":"1","following":true,"showing_reblogs":false,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} + body: {string: '{"id":"1","following":true,"showing_reblogs":true,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"d0a82968c8f9aeedda238946aae1989a"] + ETag: [W/"104706c5d5a5d4d87780cdec31e76836"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -81,10 +82,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [76639bf0-e7fe-4c88-8bc9-e0c7de46e577] - X-Runtime: ['0.072864'] + X-Request-Id: [4dbf24ce-460a-4457-b3a5-62dd116f7ca9] + X-Runtime: ['0.078180'] X-XSS-Protection: [1; mode=block] - content-length: ['174'] + content-length: ['173'] status: {code: 200, message: OK} - request: body: account_ids%5B%5D=1 @@ -97,13 +98,13 @@ interactions: Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST - uri: http://localhost:3000/api/v1/lists/9/accounts + uri: http://localhost:3000/api/v1/lists/12/accounts response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"f39c5a269dd640bacf5a55db8d2d3e90"] + ETag: [W/"0cdb2e7c6eb5550ff52103826ed9e2cd"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -111,8 +112,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [f3b0ce92-006d-410e-8d01-f0f93cc7443b] - X-Runtime: ['0.048021'] + X-Request-Id: [66b91f80-7290-4b31-9318-8f2b129b2be7] + X-Runtime: ['0.058322'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -127,11 +128,11 @@ interactions: method: GET uri: http://localhost:3000/api/v1/accounts/1/lists response: - body: {string: '[{"id":"9","title":"ham burglars"}]'} + body: {string: '[{"id":"12","title":"ham burglars"}]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"a2969b9e5d7329b172f845038528a9f8"] + ETag: [W/"403cd5e122640c4a0e94ec6f21466511"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -139,10 +140,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [591c3ebd-0fa5-4efb-aa0a-b3ccf251c4ef] - X-Runtime: ['0.027378'] + X-Request-Id: [0e41c009-30b7-4135-91bb-3f745842a841] + X-Runtime: ['0.062819'] X-XSS-Protection: [1; mode=block] - content-length: ['35'] + content-length: ['36'] status: {code: 200, message: OK} - request: body: null @@ -160,7 +161,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"78d855ca7c8355ade68a375107a29ae3"] + ETag: [W/"8f29f445514fac6569926c516a323b44"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -168,8 +169,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [227aee7e-4f8d-4dec-9e27-813b9870fe39] - X-Runtime: ['0.042813'] + X-Request-Id: [528732f0-22b6-4e38-add7-c40b233f1616] + X-Runtime: ['0.085867'] X-XSS-Protection: [1; mode=block] content-length: ['175'] status: {code: 200, message: OK} @@ -183,13 +184,13 @@ interactions: Content-Length: ['0'] User-Agent: [python-requests/2.18.4] method: DELETE - uri: http://localhost:3000/api/v1/lists/9 + uri: http://localhost:3000/api/v1/lists/12 response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"f39c5a269dd640bacf5a55db8d2d3e90"] + ETag: [W/"ffab38e79475e4159e128e2821989fd2"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -197,8 +198,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [76ebc393-c790-40fd-abb3-dcd7d35e351e] - X-Runtime: ['0.047284'] + X-Request-Id: [30abb974-4601-4cd7-9587-aba15accc618] + X-Runtime: ['0.056331'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} diff --git a/tests/cassettes/test_list_timeline.yaml b/tests/cassettes/test_list_timeline.yaml index 06aa961..e4246b3 100644 --- a/tests/cassettes/test_list_timeline.yaml +++ b/tests/cassettes/test_list_timeline.yaml @@ -12,11 +12,11 @@ interactions: method: POST uri: http://localhost:3000/api/v1/lists response: - body: {string: '{"id":"10","title":"ham burglars"}'} + body: {string: '{"id":"13","title":"ham burglars"}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"14287cb42ec1ab07b6aa44c5f19b5c1d"] + ETag: [W/"08ee126e4426f4c3dcc15b490a31c7df"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -24,8 +24,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [824c6ec5-88ea-4469-aa5b-f9f20a9c6550] - X-Runtime: ['0.020458'] + X-Request-Id: [93aed641-d8d7-4a2a-a4c2-fd803add1424] + X-Runtime: ['0.036909'] X-XSS-Protection: [1; mode=block] content-length: ['34'] status: {code: 200, message: OK} @@ -40,11 +40,11 @@ interactions: method: GET uri: http://localhost:3000/api/v1/accounts/verify_credentials response: - body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":5,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[]},"emojis":[],"fields":[]}'} + body: {string: '{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":67,"source":{"privacy":"public","sensitive":false,"language":null,"note":"","fields":[]},"emojis":[],"fields":[]}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"e8cc773e17c063bb46d8192abb677e46"] + ETag: [W/"7d5513dfb7003f3c2fffbb3f9e8c4e0d"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -52,28 +52,29 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [f4bf71a3-0740-4afc-b4d8-3ac675cc1d26] - X-Runtime: ['0.018511'] + X-Request-Id: [bd7b5669-1805-403f-94cb-22c72d70e230] + X-Runtime: ['0.050034'] X-XSS-Protection: [1; mode=block] - content-length: ['634'] + content-length: ['635'] status: {code: 200, message: OK} - request: - body: null + body: reblogs=True&id=1 headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN] Connection: [keep-alive] - Content-Length: ['0'] + Content-Length: ['17'] + Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST uri: http://localhost:3000/api/v1/accounts/1/follow response: - body: {string: '{"id":"1","following":true,"showing_reblogs":false,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} + body: {string: '{"id":"1","following":true,"showing_reblogs":true,"followed_by":false,"blocking":false,"muting":false,"muting_notifications":false,"requested":false,"domain_blocking":false}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"d0a82968c8f9aeedda238946aae1989a"] + ETag: [W/"166b4a474c2b011ac5850811efaa62e2"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -81,10 +82,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [e40ee840-b7fe-4dbb-85ec-a184f5064c43] - X-Runtime: ['0.084309'] + X-Request-Id: [8c68d798-7421-46cc-a73c-e72a3cd0f117] + X-Runtime: ['0.097679'] X-XSS-Protection: [1; mode=block] - content-length: ['174'] + content-length: ['173'] status: {code: 200, message: OK} - request: body: account_ids%5B%5D=1 @@ -97,13 +98,13 @@ interactions: Content-Type: [application/x-www-form-urlencoded] User-Agent: [python-requests/2.18.4] method: POST - uri: http://localhost:3000/api/v1/lists/10/accounts + uri: http://localhost:3000/api/v1/lists/13/accounts response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"f39c5a269dd640bacf5a55db8d2d3e90"] + ETag: [W/"ffab38e79475e4159e128e2821989fd2"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -111,8 +112,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [a6d6eb3d-c6af-4f7f-b2d7-21635c1d3971] - X-Runtime: ['0.040148'] + X-Request-Id: [626a4239-5798-47cd-86ce-a2c78e2b472c] + X-Runtime: ['0.051662'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -129,13 +130,13 @@ interactions: method: POST uri: http://localhost:3000/api/v1/statuses response: - body: {string: '{"id":"100369507189110184","created_at":"2018-07-13T21:25:38.523Z","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/100369507189110184","content":"\u003cp\u003eI - have never stolen a ham in my life.\u003c/p\u003e","url":"http://localhost:3000/@admin/100369507189110184","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py - test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":6,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'} + body: {string: '{"id":"100465052062847543","created_at":"2018-07-30T18:23:57.880Z","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/100465052062847543","content":"\u003cp\u003eI + have never stolen a ham in my life.\u003c/p\u003e","url":"http://localhost:3000/@admin/100465052062847543","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py + test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":68,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"f38648e739a25f995ed7d242b59a0a04"] + ETag: [W/"cd2e3ed193ead95de59673b883f9a7e7"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -143,10 +144,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [5249cbf5-d705-4c5b-a4e0-9681f9e55b80] - X-Runtime: ['0.133811'] + X-Request-Id: [fde17c71-c6fe-4ef2-86a0-00d835c2888c] + X-Runtime: ['0.660351'] X-XSS-Protection: [1; mode=block] - content-length: ['1196'] + content-length: ['1197'] status: {code: 200, message: OK} - request: body: null @@ -157,17 +158,17 @@ interactions: Connection: [keep-alive] User-Agent: [python-requests/2.18.4] method: GET - uri: http://localhost:3000/api/v1/timelines/list/10 + uri: http://localhost:3000/api/v1/timelines/list/13 response: - body: {string: '[{"id":"100369507189110184","created_at":"2018-07-13T21:25:38.523Z","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/100369507189110184","content":"\u003cp\u003eI - have never stolen a ham in my life.\u003c/p\u003e","url":"http://localhost:3000/@admin/100369507189110184","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"reblog":null,"application":{"name":"Mastodon.py - test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":6,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}]'} + body: {string: '[{"id":"100465052062847543","created_at":"2018-07-30T18:23:57.880Z","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/100465052062847543","content":"\u003cp\u003eI + have never stolen a ham in my life.\u003c/p\u003e","url":"http://localhost:3000/@admin/100465052062847543","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"reblog":null,"application":{"name":"Mastodon.py + test suite","website":null},"account":{"id":"1","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2018-07-13T19:35:33.303Z","note":"\u003cp\u003e\u003c/p\u003e","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":68,"emojis":[],"fields":[]},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}]'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"5ca2946eb36f6fc5ffe06ca64054b80a"] - Link: ['; - rel="next", ; + ETag: [W/"60e2292459fabb6aeeea2876de810795"] + Link: ['; + rel="next", ; rel="prev"'] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] @@ -176,10 +177,10 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [0a8771de-01e5-47ea-b308-c39646919149] - X-Runtime: ['0.063009'] + X-Request-Id: [90e19e55-3f2f-4de8-88e1-e06783835a34] + X-Runtime: ['0.114401'] X-XSS-Protection: [1; mode=block] - content-length: ['1183'] + content-length: ['1184'] status: {code: 200, message: OK} - request: body: null @@ -191,13 +192,13 @@ interactions: Content-Length: ['0'] User-Agent: [python-requests/2.18.4] method: DELETE - uri: http://localhost:3000/api/v1/statuses/100369507189110184 + uri: http://localhost:3000/api/v1/statuses/100465052062847543 response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"e550419afbc20eb5dd0d734baac1e28c"] + ETag: [W/"c7fe7763c986dce23b2aa864997670c6"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -205,8 +206,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [3fa84a36-8f29-4766-ad4b-008c536f9f0b] - X-Runtime: ['0.023745'] + X-Request-Id: [8e41a094-2f2c-48b5-93d5-008aeec044fe] + X-Runtime: ['0.029226'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK} @@ -226,7 +227,7 @@ interactions: headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"0d26e234d9adadd5bd21d9ab0dedf7fb"] + ETag: [W/"a47c9ac8c40127af7818d33139c13a8b"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -234,8 +235,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [df5c6bed-aa7b-4409-a195-f4a31b48f5c4] - X-Runtime: ['0.105460'] + X-Request-Id: [5e12d6ff-d52c-4a34-bec4-0d58e4e1b397] + X-Runtime: ['0.074404'] X-XSS-Protection: [1; mode=block] content-length: ['175'] status: {code: 200, message: OK} @@ -249,13 +250,13 @@ interactions: Content-Length: ['0'] User-Agent: [python-requests/2.18.4] method: DELETE - uri: http://localhost:3000/api/v1/lists/10 + uri: http://localhost:3000/api/v1/lists/13 response: body: {string: '{}'} headers: Cache-Control: ['max-age=0, private, must-revalidate'] Content-Type: [application/json; charset=utf-8] - ETag: [W/"e550419afbc20eb5dd0d734baac1e28c"] + ETag: [W/"c7fe7763c986dce23b2aa864997670c6"] Referrer-Policy: [strict-origin-when-cross-origin] Transfer-Encoding: [chunked] Vary: ['Accept-Encoding, Origin'] @@ -263,8 +264,8 @@ interactions: X-Download-Options: [noopen] X-Frame-Options: [SAMEORIGIN] X-Permitted-Cross-Domain-Policies: [none] - X-Request-Id: [a7d88e2f-5c75-4338-a386-944ee12bd7f9] - X-Runtime: ['0.036622'] + X-Request-Id: [7a18d813-0ceb-4961-a5c8-22ab8c3b078a] + X-Runtime: ['0.070349'] X-XSS-Protection: [1; mode=block] content-length: ['2'] status: {code: 200, message: OK}