Tidying

daemon.py

@@ -14827,11 +14827,6 @@ class PubServer(BaseHTTPRequestHandler):
         if '/users/' in path and path.endswith('/editprofile'):
             peertube_instances = self.server.peertube_instances
             nickname = get_nickname_from_actor(path)
-            if nickname:
-                city = get_spoofed_city(self.server.city,
-                                        base_dir, nickname, domain)
-            else:
-                city = self.server.city
 
             access_keys = self.server.access_keys
             if '/users/' in path:
@@ -14839,17 +14834,12 @@ class PubServer(BaseHTTPRequestHandler):
                     access_keys = self.server.key_shortcuts[nickname]
 
             default_reply_interval_hrs = self.server.default_reply_interval_hrs
-            msg = html_edit_profile(self.server, self.server.css_cache,
-                                    translate,
-                                    base_dir,
-                                    path, domain,
-                                    port,
-                                    http_prefix,
+            msg = html_edit_profile(self.server, translate,
+                                    base_dir, path, domain, port,
                                     self.server.default_timeline,
                                     self.server.theme_name,
                                     peertube_instances,
                                     self.server.text_mode_banner,
-                                    city,
                                     self.server.user_agents_blocked,
                                     self.server.crawlers_allowed,
                                     access_keys,

tests.py

@@ -3374,7 +3374,7 @@ def test_client_to_server(base_dir: str):
                              cached_webfingers,
                              person_cache, True, __version__,
                              signing_priv_key_pem)
-    for _ in range(20):
+    for _ in range(30):
         if os.path.isdir(outbox_path) and os.path.isdir(inbox_path):
             if len([name for name in os.listdir(outbox_path)
                     if os.path.isfile(os.path.join(outbox_path, name))]) == 4:

webapp_profile.py

@@ -1646,8 +1646,7 @@ def _html_edit_profile_git_projects(base_dir: str, nickname: str, domain: str,
     return edit_profile_form
 
 
-def _html_edit_profile_shared_items(base_dir: str, nickname: str, domain: str,
-                                    translate: {}) -> str:
+def _html_edit_profile_shared_items(base_dir: str, translate: {}) -> str:
     """shared items section of edit profile screen
     """
     shared_items_str = ''
@@ -2189,12 +2188,12 @@ def _html_edit_profile_top_banner(base_dir: str,
     return edit_profile_form
 
 
-def html_edit_profile(server, css_cache: {}, translate: {},
+def html_edit_profile(server, translate: {},
                       base_dir: str, path: str,
-                      domain: str, port: int, http_prefix: str,
+                      domain: str, port: int,
                       default_timeline: str, theme: str,
                       peertube_instances: [],
-                      text_mode_banner: str, city: str,
+                      text_mode_banner: str,
                       user_agents_blocked: [],
                       crawlers_allowed: [],
                       access_keys: {},
@@ -2328,8 +2327,7 @@ def html_edit_profile(server, css_cache: {}, translate: {},
                 _html_edit_profile_twitter(base_dir, translate, remove_twitter)
             # shared items section
             shares_federation_str = \
-                _html_edit_profile_shared_items(base_dir, nickname,
-                                                domain, translate)
+                _html_edit_profile_shared_items(base_dir, translate)
             instance_str, role_assign_str, peertube_str, libretranslate_str = \
                 _html_edit_profile_instance(base_dir, translate,
                                             peertube_instances,