From a2ef11c3c945ac276b5c6595bef2ebe636416c95 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Mon, 15 Apr 2024 21:31:32 +0100
Subject: [PATCH] Tidying

---
 daemon_get.py         | 24 ++++++++++++++-
 daemon_get_buttons.py | 68 ++++++++++++++++++++++++++++---------------
 2 files changed, 68 insertions(+), 24 deletions(-)

diff --git a/daemon_get.py b/daemon_get.py
index 774e85a24..3307ca3be 100644
--- a/daemon_get.py
+++ b/daemon_get.py
@@ -3702,7 +3702,29 @@ def daemon_http_get(self) -> None:
                       getreq_start_time,
                       proxy_type, cookie,
                       self.server.debug,
-                      curr_session)
+                      curr_session,
+                      self.server.recent_posts_cache,
+                      self.server.max_recent_posts,
+                      self.server.translate,
+                      self.server.project_version,
+                      self.server.cached_webfingers,
+                      self.server.person_cache,
+                      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.signing_priv_key_pem,
+                      self.server.cw_lists,
+                      self.server.lists_enabled,
+                      self.server.dogwhistles,
+                      self.server.min_images_for_accounts,
+                      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 1bda52d13..82687c684 100644
--- a/daemon_get_buttons.py
+++ b/daemon_get_buttons.py
@@ -2037,7 +2037,29 @@ def delete_button(self, calling_domain: str, path: str,
                   onion_domain: str, i2p_domain: str,
                   getreq_start_time,
                   proxy_type: str, cookie: str,
-                  debug: str, curr_session) -> None:
+                  debug: str, curr_session,
+                  recent_posts_cache: {},
+                  max_recent_posts: int,
+                  translate: {},
+                  project_version: str,
+                  cached_webfingers: {},
+                  person_cache: {},
+                  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,
+                  signing_priv_key_pem: str,
+                  cw_lists: {},
+                  lists_enabled: {},
+                  dogwhistles: {},
+                  min_images_for_accounts: bool,
+                  buy_sites: [],
+                  auto_cw_cache: {},
+                  fitness: {}) -> None:
     """Delete button is pressed on a post
     """
     if not cookie:
@@ -2110,29 +2132,29 @@ def delete_button(self, calling_domain: str, path: str,
 
         delete_str = \
             html_confirm_delete(self.server,
-                                self.server.recent_posts_cache,
-                                self.server.max_recent_posts,
-                                self.server.translate, page_number,
+                                recent_posts_cache,
+                                max_recent_posts,
+                                translate, page_number,
                                 curr_session, base_dir,
                                 delete_url, http_prefix,
-                                self.server.project_version,
-                                self.server.cached_webfingers,
-                                self.server.person_cache, calling_domain,
-                                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.signing_priv_key_pem,
-                                self.server.cw_lists,
-                                self.server.lists_enabled,
-                                self.server.dogwhistles,
-                                self.server.min_images_for_accounts,
-                                self.server.buy_sites,
-                                self.server.auto_cw_cache)
+                                project_version,
+                                cached_webfingers,
+                                person_cache, calling_domain,
+                                yt_replace_domain,
+                                twitter_replacement_domain,
+                                show_published_date_only,
+                                peertube_instances,
+                                allow_local_network_access,
+                                theme_name,
+                                system_language,
+                                max_like_count,
+                                signing_priv_key_pem,
+                                cw_lists,
+                                lists_enabled,
+                                dogwhistles,
+                                min_images_for_accounts,
+                                buy_sites,
+                                auto_cw_cache)
         if delete_str:
             delete_str_len = len(delete_str)
             set_headers(self, 'text/html', delete_str_len,
@@ -2144,7 +2166,7 @@ def delete_button(self, calling_domain: str, path: str,
         actor = 'http://' + onion_domain + users_path
     elif (calling_domain.endswith('.i2p') and i2p_domain):
         actor = 'http://' + i2p_domain + users_path
-    fitness_performance(getreq_start_time, self.server.fitness,
+    fitness_performance(getreq_start_time, fitness,
                         '_GET', '_delete_button',
                         debug)
     redirect_headers(self, actor + '/' + timeline_str,