From 9c2cb10fd470555b9f43db63d1bb9c8371cb5bfa Mon Sep 17 00:00:00 2001 From: jfm Date: Wed, 1 May 2024 20:41:01 +0200 Subject: [PATCH] Mocking mastodon server and more timeline support --- .coverage | Bin 53248 -> 53248 bytes Pipfile | 1 + Pipfile.lock | 67 ++++++++++++++++- src/mastodon/authorization.py | 1 + src/mastodon/timelines.py | 15 +++- tests/resources/fetch_token_response.json | 1 + tests/resources/register_app_response.json | 1 + tests/resources/status_reblog.json | 1 + tests/resources/timeline_home_response.json | 79 ++++++++++++++++++++ tests/test_authorization.py | 9 +++ tests/test_model.py | 4 + tests/test_timelines.py | 76 +++++++++++++++++++ 12 files changed, 251 insertions(+), 4 deletions(-) create mode 100644 tests/resources/fetch_token_response.json create mode 100644 tests/resources/register_app_response.json create mode 100644 tests/resources/status_reblog.json create mode 100644 tests/resources/timeline_home_response.json diff --git a/.coverage b/.coverage index 6d2ccce792b79511534d38a6d4b006c191d81608..7e7574f3e943b34975781e69293f4c7311b4b3d3 100644 GIT binary patch delta 131 zcmZozz}&Eac>`O6LIMN-H~x40Px-I$pW@%ozm0z_|5E;${1f?G`K$Sh`4ct^3Rv+A z3-Yrta;otE+xhQ b=eXIJfDAq+Mh-?6PEL_?XYVpDn&1EcLB1>3 delta 137 zcmZozz}&Eac>`O6LM{XU5B?AQ&-rigpW#2uzl(n(|4RP3{8RZm`Rn=1`Exf53b^xg zaqzP+atiU=eP^Fs-0$Sh&dv_x3$X9|&CUj5u${Zj#R_DIvHI;y@ i7%u#hVP^)ZVLr#r#sp;WF)^|+vT$+=l)Yax!2tkeZ6P55 diff --git a/Pipfile b/Pipfile index cfaf56b..cc5c3a9 100644 --- a/Pipfile +++ b/Pipfile @@ -19,6 +19,7 @@ pytest-cov = "*" bumpver = "*" twine = "*" build = "*" +responses = "*" [requires] python_version = "3.12" diff --git a/Pipfile.lock b/Pipfile.lock index c0089c4..ac94ab2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "33b12a5b029959f1e6600a02e05245c3a1d03e76abac6888c867dbfd5ff5270c" + "sha256": "d3742f295ed54650736ca679ed6d8dac317b290d5c53ce74cc38b9239d95b558" }, "pipfile-spec": 6, "requires": { @@ -758,6 +758,63 @@ "index": "pypi", "version": "==5.0.0" }, + "pyyaml": { + "hashes": [ + "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5", + "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc", + "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df", + "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741", + "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206", + "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27", + "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595", + "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62", + "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98", + "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696", + "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290", + "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9", + "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d", + "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6", + "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867", + "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47", + "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486", + "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6", + "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3", + "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007", + "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938", + "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0", + "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c", + "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735", + "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d", + "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28", + "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4", + "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba", + "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8", + "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef", + "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5", + "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd", + "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3", + "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0", + "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515", + "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c", + "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c", + "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924", + "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34", + "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43", + "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859", + "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673", + "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54", + "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a", + "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b", + "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab", + "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa", + "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c", + "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585", + "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d", + "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f" + ], + "markers": "python_version >= '3.6'", + "version": "==6.0.1" + }, "readme-renderer": { "hashes": [ "sha256:1818dd28140813509eeed8d62687f7cd4f7bad90d4db586001c5dc09d4fde311", @@ -782,6 +839,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.0.0" }, + "responses": { + "hashes": [ + "sha256:01ae6a02b4f34e39bffceb0fc6786b67a25eae919c6368d05eabc8d9576c2a66", + "sha256:2f0b9c2b6437db4b528619a77e5d565e4ec2a9532162ac1a131a83529db7be1a" + ], + "index": "pypi", + "version": "==0.25.0" + }, "rfc3986": { "hashes": [ "sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd", diff --git a/src/mastodon/authorization.py b/src/mastodon/authorization.py index 4a9c098..8eeb8de 100644 --- a/src/mastodon/authorization.py +++ b/src/mastodon/authorization.py @@ -36,6 +36,7 @@ class MastodonAuthorization(): }) response_json = response.json() + logger.info(response_json) if response.status_code == 200: self.config.set_value("access_token", response_json["access_token"]) self.config.save() diff --git a/src/mastodon/timelines.py b/src/mastodon/timelines.py index cf13f10..cd2b208 100644 --- a/src/mastodon/timelines.py +++ b/src/mastodon/timelines.py @@ -8,9 +8,18 @@ class Timelines(): self.config = configuration self.auth = authorization - def home_timeline(self): + def home_timeline(self, min_id=None, max_id=None, since_id=None, limit=None): url = "https://"+self.config.get_value("server")+"/api/v1/timelines/home" - response = requests.get(url, headers=self.auth.get_auth_headers()) - return response.json() + parameters = dict() + if(min_id is not None): + parameters["min_id"] = min_id + if(max_id is not None): + parameters["max_id"] = max_id + if(since_id is not None): + parameters["since_id"] = since_id + if(limit is not None): + parameters["limit"] = limit + response = requests.get(url, headers=self.auth.get_auth_headers(), params=parameters) + return response.json() diff --git a/tests/resources/fetch_token_response.json b/tests/resources/fetch_token_response.json new file mode 100644 index 0000000..53b603f --- /dev/null +++ b/tests/resources/fetch_token_response.json @@ -0,0 +1 @@ +{"access_token": "-Us2pbm240grRk1AtDV8WR2LKGdXxSgmijS9hDTN_UU", "token_type": "Bearer", "scope": "read write follow", "created_at": 1714575791} diff --git a/tests/resources/register_app_response.json b/tests/resources/register_app_response.json new file mode 100644 index 0000000..62bfdf0 --- /dev/null +++ b/tests/resources/register_app_response.json @@ -0,0 +1 @@ +{"id": "23", "name": "pymastodon", "website": null, "redirect_uri": "urn:ietf:wg:oauth:2.0:oob", "client_id": "eCOa1SxyccrfUBcimdntj6USlf7ythGlLnCFvYDHD5E", "client_secret": "eugdHJ7ckwukrPJmT09lrl8DBLbAmLdonsrQNjvMfIA", "vapid_key": "BH5OXv4oZ56KihDwvApTep3us7Ex2c7bnYVDpfM8CCnkSNC64bj_22NZwoYCVczleMj08xxT5nkupjS8c-ldDdo="} diff --git a/tests/resources/status_reblog.json b/tests/resources/status_reblog.json new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/tests/resources/status_reblog.json @@ -0,0 +1 @@ + diff --git a/tests/resources/timeline_home_response.json b/tests/resources/timeline_home_response.json new file mode 100644 index 0000000..86cd586 --- /dev/null +++ b/tests/resources/timeline_home_response.json @@ -0,0 +1,79 @@ +[{ + "id": "103270115826048975", + "created_at": "2019-12-08T03:48:33.901Z", + "in_reply_to_id": null, + "in_reply_to_account_id": null, + "sensitive": false, + "spoiler_text": "", + "visibility": "public", + "language": "en", + "uri": "https://mastodon.social/users/Gargron/statuses/103270115826048975", + "url": "https://mastodon.social/@Gargron/103270115826048975", + "replies_count": 5, + "reblogs_count": 6, + "favourites_count": 11, + "favourited": false, + "reblogged": false, + "muted": false, + "bookmarked": false, + "content": "

"I lost my inheritance with one wrong digit on my sort code"

https://www.theguardian.com/money/2019/dec/07/i-lost-my-193000-inheritance-with-one-wrong-digit-on-my-sort-code", + "reblog": null, + "application": { + "name": "Web", + "website": null + }, + "account": { + "id": "1", + "username": "Gargron", + "acct": "Gargron", + "display_name": "Eugen", + "locked": false, + "bot": false, + "discoverable": true, + "group": false, + "created_at": "2016-03-16T14:34:26.392Z", + "note": "

Developer of Mastodon and administrator of mastodon.social. I post service announcements, development updates, and personal stuff.

", + "url": "https://mastodon.social/@Gargron", + "avatar": "https://files.mastodon.social/accounts/avatars/000/000/001/original/d96d39a0abb45b92.jpg", + "avatar_static": "https://files.mastodon.social/accounts/avatars/000/000/001/original/d96d39a0abb45b92.jpg", + "header": "https://files.mastodon.social/accounts/headers/000/000/001/original/c91b871f294ea63e.png", + "header_static": "https://files.mastodon.social/accounts/headers/000/000/001/original/c91b871f294ea63e.png", + "followers_count": 322930, + "following_count": 459, + "statuses_count": 61323, + "last_status_at": "2019-12-10T08:14:44.811Z", + "emojis": [], + "fields": [ + { + "name": "Patreon", + "value": "https://www.patreon.com/mastodonhttps://zeonfederated.com