From 634e601a460e3eb90f7f3aa5966a795390a82deb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Tue, 31 May 2022 15:00:49 +0100
Subject: [PATCH] Tidying

---
 desktop_client.py | 21 +++++++--------------
 epicyon.py        |  3 +--
 posts.py          |  3 +--
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/desktop_client.py b/desktop_client.py
index 8258488a7..fbd7c4bf5 100644
--- a/desktop_client.py
+++ b/desktop_client.py
@@ -1482,8 +1482,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
                              system_language, espeak)
             pgp_key_upload = True
 
-        box_json = c2s_box_json(base_dir, session,
-                                nickname, password,
+        box_json = c2s_box_json(session, nickname, password,
                                 domain, port, http_prefix,
                                 curr_timeline, page_number,
                                 debug, signing_priv_key_pem)
@@ -1499,8 +1498,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
 
         if not (curr_timeline == 'inbox' and page_number == 1):
             # monitor the inbox to generate notifications
-            inbox_json = c2s_box_json(base_dir, session,
-                                      nickname, password,
+            inbox_json = c2s_box_json(session, nickname, password,
                                       domain, port, http_prefix,
                                       'inbox', 1, debug,
                                       signing_priv_key_pem)
@@ -1575,8 +1573,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
                 page_number = 1
                 prev_timeline_first_id = ''
                 curr_timeline = 'dm'
-                box_json = c2s_box_json(base_dir, session,
-                                        nickname, password,
+                box_json = c2s_box_json(session, nickname, password,
                                         domain, port, http_prefix,
                                         curr_timeline, page_number,
                                         debug, signing_priv_key_pem)
@@ -1592,8 +1589,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
                 page_number = 1
                 prev_timeline_first_id = ''
                 curr_timeline = 'tlreplies'
-                box_json = c2s_box_json(base_dir, session,
-                                        nickname, password,
+                box_json = c2s_box_json(session, nickname, password,
                                         domain, port, http_prefix,
                                         curr_timeline, page_number,
                                         debug, signing_priv_key_pem)
@@ -1610,8 +1606,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
                 page_number = 1
                 prev_timeline_first_id = ''
                 curr_timeline = 'tlbookmarks'
-                box_json = c2s_box_json(base_dir, session,
-                                        nickname, password,
+                box_json = c2s_box_json(session, nickname, password,
                                         domain, port, http_prefix,
                                         curr_timeline, page_number,
                                         debug, signing_priv_key_pem)
@@ -1629,8 +1624,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
                 page_number = 1
                 prev_timeline_first_id = ''
                 curr_timeline = 'outbox'
-                box_json = c2s_box_json(base_dir, session,
-                                        nickname, password,
+                box_json = c2s_box_json(session, nickname, password,
                                         domain, port, http_prefix,
                                         curr_timeline, page_number,
                                         debug, signing_priv_key_pem)
@@ -1655,8 +1649,7 @@ def run_desktop_client(base_dir: str, proxy_type: str, http_prefix: str,
                 page_number -= 1
                 page_number = max(page_number, 1)
                 prev_timeline_first_id = ''
-                box_json = c2s_box_json(base_dir, session,
-                                        nickname, password,
+                box_json = c2s_box_json(session, nickname, password,
                                         domain, port, http_prefix,
                                         curr_timeline, page_number,
                                         debug, signing_priv_key_pem)
diff --git a/epicyon.py b/epicyon.py
index 7e0a957ce..03a7d7836 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -1681,8 +1681,7 @@ def _command_options() -> None:
             signing_priv_key_pem = get_instance_actor_key(base_dir, domain)
 
         session = create_session(proxy_type)
-        box_json = c2s_box_json(base_dir, session,
-                                argb.nickname, argb.password,
+        box_json = c2s_box_json(session, argb.nickname, argb.password,
                                 domain, port, http_prefix,
                                 argb.box, argb.pageNumber,
                                 argb.debug, signing_priv_key_pem)
diff --git a/posts.py b/posts.py
index 95175b431..78c8fa3bd 100644
--- a/posts.py
+++ b/posts.py
@@ -5497,8 +5497,7 @@ def post_is_muted(base_dir: str, nickname: str, domain: str,
     return is_muted
 
 
-def c2s_box_json(base_dir: str, session,
-                 nickname: str, password: str,
+def c2s_box_json(session, nickname: str, password: str,
                  domain: str, port: int,
                  http_prefix: str,
                  box_name: str, page_number: int,