indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/30/head
Bob Mottram 2024-04-15 17:12:01 +01:00
parent f255b7a41a
commit 6fa14a3b8f
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
daemon_get.py
View File

@ -3336,7 +3336,16 @@ def daemon_http_get(self) -> None:
getreq_start_time, getreq_start_time,
proxy_type, proxy_type,
self.server.debug, self.server.debug,
curr_session) curr_session,
self.server.federation_list,
self.server.send_threads,
self.server.postLog,
self.server.cached_webfingers,
self.server.person_cache,
self.server.project_version,
self.server.sites_unavailable,
self.server.system_language,
self.server.fitness)
self.server.getreq_busy = False self.server.getreq_busy = False
return return

29
daemon_get_buttons.py
View File

@ -437,7 +437,16 @@ def follow_approve_button(self, calling_domain: str, path: str,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
getreq_start_time, getreq_start_time,
proxy_type: str, debug: bool, proxy_type: str, debug: bool,
curr_session) -> None: curr_session,
federation_list: [],
send_threads: {},
post_log: {},
cached_webfingers: {},
person_cache: {},
project_version: str,
sites_unavailable: [],
system_language: str,
fitness: {}) -> None:
"""Follow approve button was pressed """Follow approve button was pressed
""" """
origin_path_str = path.split('/followapprove=')[0] origin_path_str = path.split('/followapprove=')[0]
@ -487,18 +496,18 @@ def follow_approve_button(self, calling_domain: str, path: str,
follower_nickname, follower_nickname,
domain, port, domain, port,
following_handle, following_handle,
self.server.federation_list, federation_list,
self.server.send_threads, send_threads,
self.server.postLog, post_log,
self.server.cached_webfingers, cached_webfingers,
self.server.person_cache, person_cache,
debug, debug,
self.server.project_version, project_version,
signing_priv_key_pem, signing_priv_key_pem,
proxy_type, proxy_type,
followers_sync_cache, followers_sync_cache,
self.server.sites_unavailable, sites_unavailable,
self.server.system_language) system_language)
origin_path_str_absolute = \ origin_path_str_absolute = \
http_prefix + '://' + domain_full + origin_path_str http_prefix + '://' + domain_full + origin_path_str
if calling_domain.endswith('.onion') and onion_domain: if calling_domain.endswith('.onion') and onion_domain:
@ -507,7 +516,7 @@ def follow_approve_button(self, calling_domain: str, path: str,
elif (calling_domain.endswith('.i2p') and i2p_domain): elif (calling_domain.endswith('.i2p') and i2p_domain):
origin_path_str_absolute = \ origin_path_str_absolute = \
'http://' + i2p_domain + origin_path_str 'http://' + i2p_domain + origin_path_str
fitness_performance(getreq_start_time, self.server.fitness, fitness_performance(getreq_start_time, fitness,
'_GET', '_follow_approve_button', '_GET', '_follow_approve_button',
debug) debug)
redirect_headers(self, origin_path_str_absolute, redirect_headers(self, origin_path_str_absolute,