From 2ed179167b08600b22f4e722ed068178a0e08537 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 6 Mar 2023 14:00:05 +0000 Subject: [PATCH] fix some stuff --- .gitignore | 3 +++ get_context.py | 29 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0570248 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.vscode/launch.json +artifacts/replied_toot_server_ids +artifacts/seen_urls diff --git a/get_context.py b/get_context.py index f41bb6c..a657d69 100644 --- a/get_context.py +++ b/get_context.py @@ -33,24 +33,23 @@ def pull_context( if max_home_timeline_length > 0: + """Do the same with any toots on the key owner's home timeline """ timeline_toots = get_timeline(server, access_token, max_home_timeline_length) known_context_urls = get_all_known_context_urls(server, timeline_toots) - seen_urls.update(known_context_urls) replied_toot_ids = get_all_replied_toot_server_ids( - server, reply_toots, replied_toot_server_ids + server, timeline_toots, replied_toot_server_ids ) - context_urls = get_all_context_urls(server, replied_toot_ids) - add_context_urls(server, access_token, context_urls, seen_urls) + add_context_urls(server, access_token, known_context_urls, seen_urls) def get_timeline(server, access_token, max): - """Get all post in the user's timeline""" - + """Get all post in the user's home timeline""" url = f"https://{server}/api/v1/timelines/home" response = get_toots(url, access_token) toots = response.json() + # Paginate as needed while len(toots) < max: response = get_toots(response.links['next']['url'], access_token) toots = toots + response.json() @@ -218,12 +217,7 @@ def get_replied_toot_server_id(server, toot, replied_toot_server_ids): if url is None: return None - match = parse_mastodon_url(url) - if match is not None: - replied_toot_server_ids[o_url] = (url, match) - return (url, match) - - match = parse_pleroma_url(url) + match = parse_url(url) if match is not None: replied_toot_server_ids[o_url] = (url, match) return (url, match) @@ -390,9 +384,14 @@ if __name__ == "__main__": HELP_MESSAGE = """ Usage: python3 pull_context.py -The access token can be generated at -https:///settings/applications, and must have read:search, -read:statuses and admin:read:accounts scopes. + - : The access token can be generated at https:///settings/applications, + and must have read:search, read:statuses and admin:read:accounts scopes. + - : The name of your server (e.g. `mstdn.thms.uk`) + - : Only look at posts that have received replies in this period + - : Also look for replies to posts in the API-Key owner's home timeline, up to + this many posts + + """