From 08f6ebc69a8ac5dcf27f006dd2a539225a895bc8 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 15 Apr 2024 20:05:33 +0100 Subject: [PATCH] Tidying --- daemon_get.py | 25 ++++++++++++++- daemon_get_buttons.py | 75 ++++++++++++++++++++++++++++--------------- 2 files changed, 73 insertions(+), 27 deletions(-) diff --git a/daemon_get.py b/daemon_get.py index f1fae4d33..f29da5c0f 100644 --- a/daemon_get.py +++ b/daemon_get.py @@ -3487,7 +3487,30 @@ def daemon_http_get(self) -> None: proxy_type, cookie, self.server.debug, - curr_session) + curr_session, + self.server.signing_priv_key_pem, + self.server.recent_posts_cache, + self.server.max_recent_posts, + self.server.translate, + self.server.cached_webfingers, + self.server.person_cache, + self.server.port, + self.server.allow_deletion, + self.server.project_version, + self.server.yt_replace_domain, + self.server.twitter_replacement_domain, + self.server.show_published_date_only, + self.server.peertube_instances, + self.server.allow_local_network_access, + self.server.theme_name, + self.server.system_language, + self.server.max_like_count, + self.server.cw_lists, + self.server.lists_enabled, + self.server.dogwhistles, + self.server.buy_sites, + self.server.auto_cw_cache, + self.server.fitness) self.server.getreq_busy = False return diff --git a/daemon_get_buttons.py b/daemon_get_buttons.py index cf6fdd467..d48c5729d 100644 --- a/daemon_get_buttons.py +++ b/daemon_get_buttons.py @@ -1087,7 +1087,30 @@ def reaction_button(self, calling_domain: str, path: str, getreq_start_time, proxy_type: str, cookie: str, debug: str, - curr_session) -> None: + curr_session, + signing_priv_key_pem: str, + recent_posts_cache: {}, + max_recent_posts: int, + translate: {}, + cached_webfingers: {}, + person_cache: {}, + port: int, + allow_deletion: bool, + project_version: str, + yt_replace_domain: str, + twitter_replacement_domain: str, + show_published_date_only: bool, + peertube_instances: [], + allow_local_network_access: bool, + theme_name: str, + system_language: str, + max_like_count: int, + cw_lists: {}, + lists_enabled: {}, + dogwhistles: {}, + buy_sites: [], + auto_cw_cache: {}, + fitness: {}) -> None: """Press an emoji reaction button Note that this is not the emoji reaction selection icon at the bottom of the post @@ -1209,10 +1232,10 @@ def reaction_button(self, calling_domain: str, path: str, } # send out the emoji reaction to followers - post_to_outbox(self, reaction_json, self.server.project_version, None, + post_to_outbox(self, reaction_json, project_version, None, curr_session, proxy_type) - fitness_performance(getreq_start_time, self.server.fitness, + fitness_performance(getreq_start_time, fitness, '_GET', '_reaction_button postToOutbox', debug) @@ -1276,41 +1299,41 @@ def reaction_button(self, calling_domain: str, path: str, if self.post_to_nickname in \ self.server.min_images_for_accounts: minimize_all_images = True - individual_post_as_html(self.server.signing_priv_key_pem, + individual_post_as_html(signing_priv_key_pem, False, - self.server.recent_posts_cache, - self.server.max_recent_posts, - self.server.translate, + recent_posts_cache, + max_recent_posts, + translate, page_number, base_dir, curr_session, - self.server.cached_webfingers, - self.server.person_cache, + cached_webfingers, + person_cache, self.post_to_nickname, domain, - self.server.port, reaction_post_json, + port, reaction_post_json, None, True, - self.server.allow_deletion, + allow_deletion, http_prefix, - self.server.project_version, + project_version, timeline_str, - self.server.yt_replace_domain, - self.server.twitter_replacement_domain, - self.server.show_published_date_only, - self.server.peertube_instances, - self.server.allow_local_network_access, - self.server.theme_name, - self.server.system_language, - self.server.max_like_count, + yt_replace_domain, + twitter_replacement_domain, + show_published_date_only, + peertube_instances, + allow_local_network_access, + theme_name, + system_language, + max_like_count, show_repeats, show_individual_post_icons, manually_approve_followers, False, True, False, - self.server.cw_lists, - self.server.lists_enabled, + cw_lists, + lists_enabled, timezone, mitm, bold_reading, - self.server.dogwhistles, + dogwhistles, minimize_all_images, None, - self.server.buy_sites, - self.server.auto_cw_cache) + buy_sites, + auto_cw_cache) else: print('WARN: Emoji reaction post not found: ' + reaction_post_filename) @@ -1330,7 +1353,7 @@ def reaction_button(self, calling_domain: str, path: str, actor_absolute + '/' + timeline_str + \ '?page=' + str(page_number) + first_post_id + \ timeline_bookmark - fitness_performance(getreq_start_time, self.server.fitness, + fitness_performance(getreq_start_time, fitness, '_GET', '_reaction_button', debug) redirect_headers(self, actor_path_str, cookie,