From c15c71a4163f3c51c05ebfbbfddb437d0ba4f33a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 28 Apr 2024 11:04:09 +0100 Subject: [PATCH] Tidying --- daemon_get.py | 5 ++++- daemon_get_timeline.py | 12 +++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/daemon_get.py b/daemon_get.py index 04854fd1c..4dab62ea3 100644 --- a/daemon_get.py +++ b/daemon_get.py @@ -4718,7 +4718,10 @@ def daemon_http_get(self) -> None: self.server.min_images_for_accounts, self.server.buy_sites, self.server.auto_cw_cache, - self.server.fitness): + self.server.fitness, + self.server.full_width_tl_button_header, + self.server.onion_domain, + self.server.i2p_domain): self.server.getreq_busy = False return diff --git a/daemon_get_timeline.py b/daemon_get_timeline.py index bd0d7e88c..1af471bc8 100644 --- a/daemon_get_timeline.py +++ b/daemon_get_timeline.py @@ -81,7 +81,10 @@ def show_media_timeline(self, authorized: bool, min_images_for_accounts: {}, buy_sites: [], auto_cw_cache: {}, - fitness: {}) -> bool: + fitness: {}, + full_width_tl_button_header: bool, + onion_domain: str, + i2p_domain: str) -> bool: """Shows the media timeline """ if '/users/' in path: @@ -127,8 +130,6 @@ def show_media_timeline(self, authorized: bool, True, 0, positive_voting, voting_time_mins) - full_width_tl_button_header = \ - self.server.full_width_tl_button_header minimal_nick = is_minimal(base_dir, domain, nickname) if key_shortcuts.get(nickname): @@ -207,8 +208,6 @@ def show_media_timeline(self, authorized: bool, else: # don't need authorized fetch here because there is # already the authorization check - onion_domain = self.server.onion_domain - i2p_domain = self.server.i2p_domain msg_str = json.dumps(inbox_media_feed, ensure_ascii=False) msg_str = convert_domains(calling_domain, @@ -224,8 +223,7 @@ def show_media_timeline(self, authorized: bool, set_headers(self, protocol_str, msglen, None, calling_domain, False) write2(self, msg) - fitness_performance(getreq_start_time, - fitness, + fitness_performance(getreq_start_time, fitness, '_GET', '_show_media_timeline json', debug) return True