1 files changed, 116 insertions, 0 deletions
diff --git a/tests/cassettes/test_id_hook_within_reblog.yaml b/tests/cassettes/test_id_hook_within_reblog.yaml
index b5f4953..7f1e057 100644
--- a/tests/cassettes/test_id_hook_within_reblog.yaml
+++ b/tests/cassettes/test_id_hook_within_reblog.yaml
@@ -115,4 +115,120 @@ interactions:
      X-XSS-Protection: [1; mode=block]
      content-length: ['2']
    status: {code: 200, message: OK}
+- request:
+    body: status=Toot%21
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Connection: [keep-alive]
+      Content-Length: ['14']
+      Content-Type: [application/x-www-form-urlencoded]
+      User-Agent: [python-requests/2.9.1]
+    method: POST
+    uri: http://localhost:3000/api/v1/statuses
+  response:
+    body: {string: '{"id":"99882232497132712","created_at":"2018-04-18T20:05:16.800Z","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/99882232497132712","content":"\u003cp\u003eToot!\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882232497132712","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":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","followers_count":0,"following_count":0,"statuses_count":22},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'}
+    headers:
+      Cache-Control: ['max-age=0, private, must-revalidate']
+      Content-Type: [application/json; charset=utf-8]
+      ETag: [W/"b49b4319c146920ce2dfbecb25e80239"]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Content-Type-Options: [nosniff]
+      X-Frame-Options: [SAMEORIGIN]
+      X-Request-Id: [39e238da-c1f0-4b8a-8702-b82796069aee]
+      X-Runtime: ['0.304086']
+      X-XSS-Protection: [1; mode=block]
+      content-length: ['1397']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Connection: [keep-alive]
+      Content-Length: ['0']
+      User-Agent: [python-requests/2.9.1]
+    method: POST
+    uri: http://localhost:3000/api/v1/statuses/99882232497132712/reblog
+  response:
+    body: {string: '{"id":"99882232512996684","created_at":"2018-04-18T20:05:17.018Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":null,"uri":"http://localhost:3000/users/mastodonpy_test/statuses/99882232512996684/activity","content":"\u003cp\u003eRT
+        \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
+        Toot!\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882232512996684","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":true,"muted":false,"reblog":{"id":"99882232497132712","created_at":"2018-04-18T20:05:16.800Z","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/99882232497132712","content":"\u003cp\u003eToot!\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882232497132712","reblogs_count":1,"favourites_count":0,"favourited":false,"reblogged":true,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
+        test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","followers_count":0,"following_count":0,"statuses_count":21},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]},"application":null,"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
+        Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
+        walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","followers_count":0,"following_count":0,"statuses_count":22},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'}
+    headers:
+      Cache-Control: ['max-age=0, private, must-revalidate']
+      Content-Type: [application/json; charset=utf-8]
+      ETag: [W/"858e6f9e24c9039f8bf0dbec251f1bd7"]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Content-Type-Options: [nosniff]
+      X-Frame-Options: [SAMEORIGIN]
+      X-Request-Id: [7ee1abd3-b02d-485b-9624-c03a914e5238]
+      X-Runtime: ['0.196004']
+      X-XSS-Protection: [1; mode=block]
+      content-length: ['2940']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Connection: [keep-alive]
+      Content-Length: ['0']
+      User-Agent: [python-requests/2.9.1]
+    method: DELETE
+    uri: http://localhost:3000/api/v1/statuses/99882232512996684
+  response:
+    body: {string: '{}'}
+    headers:
+      Cache-Control: ['max-age=0, private, must-revalidate']
+      Content-Type: [application/json; charset=utf-8]
+      ETag: [W/"732a336fc6149f593fb37b18039e30cf"]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Content-Type-Options: [nosniff]
+      X-Frame-Options: [SAMEORIGIN]
+      X-Request-Id: [5455d444-5f52-4684-a18b-0a51cd433ea1]
+      X-Runtime: ['0.055550']
+      X-XSS-Protection: [1; mode=block]
+      content-length: ['2']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
+      Connection: [keep-alive]
+      Content-Length: ['0']
+      User-Agent: [python-requests/2.9.1]
+    method: DELETE
+    uri: http://localhost:3000/api/v1/statuses/99882232497132712
+  response:
+    body: {string: '{}'}
+    headers:
+      Cache-Control: ['max-age=0, private, must-revalidate']
+      Content-Type: [application/json; charset=utf-8]
+      ETag: [W/"732a336fc6149f593fb37b18039e30cf"]
+      Transfer-Encoding: [chunked]
+      Vary: ['Accept-Encoding, Origin']
+      X-Content-Type-Options: [nosniff]
+      X-Frame-Options: [SAMEORIGIN]
+      X-Request-Id: [8992b247-2724-4455-9d81-b69082f6fc73]
+      X-Runtime: ['0.081221']
+      X-XSS-Protection: [1; mode=block]
+      content-length: ['2']
+    status: {code: 200, message: OK}
 version: 1

diff --git a/tests/cassettes/test_id_hook_within_reblog.yaml b/tests/cassettes/test_id_hook_within_reblog.yaml index b5f4953..7f1e057 100644 --- a/tests/cassettes/test_id_hook_within_reblog.yaml +++ b/tests/cassettes/test_id_hook_within_reblog.yaml
@@ -115,4 +115,120 @@ interactions:
115	X-XSS-Protection: [1; mode=block]	115	X-XSS-Protection: [1; mode=block]
116	content-length: ['2']	116	content-length: ['2']
117	status: {code: 200, message: OK}	117	status: {code: 200, message: OK}
		118	- request:
		119	body: status=Toot%21
		120	headers:
		121	Accept: ['/']
		122	Accept-Encoding: ['gzip, deflate']
		123	Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
		124	Connection: [keep-alive]
		125	Content-Length: ['14']
		126	Content-Type: [application/x-www-form-urlencoded]
		127	User-Agent: [python-requests/2.9.1]
		128	method: POST
		129	uri: http://localhost:3000/api/v1/statuses
		130	response:
		131	body: {string: '{"id":"99882232497132712","created_at":"2018-04-18T20:05:16.800Z","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/99882232497132712","content":"\u003cp\u003eToot!\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882232497132712","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":false,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
		132	test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
		133	Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
		134	walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","followers_count":0,"following_count":0,"statuses_count":22},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'}
		135	headers:
		136	Cache-Control: ['max-age=0, private, must-revalidate']
		137	Content-Type: [application/json; charset=utf-8]
		138	ETag: [W/"b49b4319c146920ce2dfbecb25e80239"]
		139	Transfer-Encoding: [chunked]
		140	Vary: ['Accept-Encoding, Origin']
		141	X-Content-Type-Options: [nosniff]
		142	X-Frame-Options: [SAMEORIGIN]
		143	X-Request-Id: [39e238da-c1f0-4b8a-8702-b82796069aee]
		144	X-Runtime: ['0.304086']
		145	X-XSS-Protection: [1; mode=block]
		146	content-length: ['1397']
		147	status: {code: 200, message: OK}
		148	- request:
		149	body: null
		150	headers:
		151	Accept: ['/']
		152	Accept-Encoding: ['gzip, deflate']
		153	Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
		154	Connection: [keep-alive]
		155	Content-Length: ['0']
		156	User-Agent: [python-requests/2.9.1]
		157	method: POST
		158	uri: http://localhost:3000/api/v1/statuses/99882232497132712/reblog
		159	response:
		160	body: {string: '{"id":"99882232512996684","created_at":"2018-04-18T20:05:17.018Z","in_reply_to_id":null,"in_reply_to_account_id":null,"sensitive":false,"spoiler_text":"","visibility":"public","language":null,"uri":"http://localhost:3000/users/mastodonpy_test/statuses/99882232512996684/activity","content":"\u003cp\u003eRT
		161	\u003cspan class=\"h-card\"\u003e\u003ca href=\"http://localhost:3000/@mastodonpy_test\"
		162	class=\"u-url mention\"\u003e@\u003cspan\u003emastodonpy_test\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e
		163	Toot!\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882232512996684","reblogs_count":0,"favourites_count":0,"favourited":false,"reblogged":true,"muted":false,"reblog":{"id":"99882232497132712","created_at":"2018-04-18T20:05:16.800Z","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/99882232497132712","content":"\u003cp\u003eToot!\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test/99882232497132712","reblogs_count":1,"favourites_count":0,"favourited":false,"reblogged":true,"muted":false,"pinned":false,"reblog":null,"application":{"name":"Mastodon.py
		164	test suite","website":null},"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
		165	Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
		166	walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","followers_count":0,"following_count":0,"statuses_count":21},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]},"application":null,"account":{"id":"1234567890123456","username":"mastodonpy_test","acct":"mastodonpy_test","display_name":"John
		167	Lennon","locked":true,"created_at":"2018-04-18T20:04:06.511Z","note":"\u003cp\u003eI
		168	walk funny\u003c/p\u003e","url":"http://localhost:3000/@mastodonpy_test","avatar":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","avatar_static":"http://localhost:3000/system/accounts/avatars/123/456/789/012/345/original/mastodonpyupload_.jpe","header":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","header_static":"http://localhost:3000/system/accounts/headers/123/456/789/012/345/original/mastodonpyupload_.jpe","followers_count":0,"following_count":0,"statuses_count":22},"media_attachments":[],"mentions":[],"tags":[],"emojis":[]}'}
		169	headers:
		170	Cache-Control: ['max-age=0, private, must-revalidate']
		171	Content-Type: [application/json; charset=utf-8]
		172	ETag: [W/"858e6f9e24c9039f8bf0dbec251f1bd7"]
		173	Transfer-Encoding: [chunked]
		174	Vary: ['Accept-Encoding, Origin']
		175	X-Content-Type-Options: [nosniff]
		176	X-Frame-Options: [SAMEORIGIN]
		177	X-Request-Id: [7ee1abd3-b02d-485b-9624-c03a914e5238]
		178	X-Runtime: ['0.196004']
		179	X-XSS-Protection: [1; mode=block]
		180	content-length: ['2940']
		181	status: {code: 200, message: OK}
		182	- request:
		183	body: null
		184	headers:
		185	Accept: ['/']
		186	Accept-Encoding: ['gzip, deflate']
		187	Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
		188	Connection: [keep-alive]
		189	Content-Length: ['0']
		190	User-Agent: [python-requests/2.9.1]
		191	method: DELETE
		192	uri: http://localhost:3000/api/v1/statuses/99882232512996684
		193	response:
		194	body: {string: '{}'}
		195	headers:
		196	Cache-Control: ['max-age=0, private, must-revalidate']
		197	Content-Type: [application/json; charset=utf-8]
		198	ETag: [W/"732a336fc6149f593fb37b18039e30cf"]
		199	Transfer-Encoding: [chunked]
		200	Vary: ['Accept-Encoding, Origin']
		201	X-Content-Type-Options: [nosniff]
		202	X-Frame-Options: [SAMEORIGIN]
		203	X-Request-Id: [5455d444-5f52-4684-a18b-0a51cd433ea1]
		204	X-Runtime: ['0.055550']
		205	X-XSS-Protection: [1; mode=block]
		206	content-length: ['2']
		207	status: {code: 200, message: OK}
		208	- request:
		209	body: null
		210	headers:
		211	Accept: ['/']
		212	Accept-Encoding: ['gzip, deflate']
		213	Authorization: [Bearer __MASTODON_PY_TEST_ACCESS_TOKEN]
		214	Connection: [keep-alive]
		215	Content-Length: ['0']
		216	User-Agent: [python-requests/2.9.1]
		217	method: DELETE
		218	uri: http://localhost:3000/api/v1/statuses/99882232497132712
		219	response:
		220	body: {string: '{}'}
		221	headers:
		222	Cache-Control: ['max-age=0, private, must-revalidate']
		223	Content-Type: [application/json; charset=utf-8]
		224	ETag: [W/"732a336fc6149f593fb37b18039e30cf"]
		225	Transfer-Encoding: [chunked]
		226	Vary: ['Accept-Encoding, Origin']
		227	X-Content-Type-Options: [nosniff]
		228	X-Frame-Options: [SAMEORIGIN]
		229	X-Request-Id: [8992b247-2724-4455-9d81-b69082f6fc73]
		230	X-Runtime: ['0.081221']
		231	X-XSS-Protection: [1; mode=block]
		232	content-length: ['2']
		233	status: {code: 200, message: OK}
118	version: 1	234	version: 1