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

Ambiguous function name

merge-requests/30/head
Bob Mottram 2024-02-29 11:42:30 +00:00
parent cf93cb5ee3
commit 09bf62e9fa
1 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
daemon.py
View File

@ -2941,7 +2941,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.postreq_busy = False self.server.postreq_busy = False
return return
def _person_options(self, path: str, def _person_options2(self, path: str,
calling_domain: str, cookie: str, calling_domain: str, cookie: str,
base_dir: str, http_prefix: str, base_dir: str, http_prefix: str,
domain: str, domain_full: str, port: int, domain: str, domain_full: str, port: int,
@ -4808,10 +4808,9 @@ class PubServer(BaseHTTPRequestHandler):
'?options=' + actor + ';1;' + avatar_url '?options=' + actor + ';1;' + avatar_url
self._show_person_options(calling_domain, profile_path_str, self._show_person_options(calling_domain, profile_path_str,
base_dir, http_prefix, base_dir,
domain, domain_full, domain, domain_full,
getreq_start_time, getreq_start_time,
onion_domain, i2p_domain,
cookie, debug, authorized, cookie, debug, authorized,
curr_session) curr_session)
return return
@ -9027,10 +9026,9 @@ class PubServer(BaseHTTPRequestHandler):
self._404(20) self._404(20)
def _show_person_options(self, calling_domain: str, path: str, def _show_person_options(self, calling_domain: str, path: str,
base_dir: str, http_prefix: str, base_dir: str,
domain: str, domain_full: str, domain: str, domain_full: str,
getreq_start_time, getreq_start_time,
onion_domain: str, i2p_domain: str,
cookie: str, debug: bool, cookie: str, debug: bool,
authorized: bool, authorized: bool,
curr_session) -> None: curr_session) -> None:
@ -18916,12 +18914,9 @@ class PubServer(BaseHTTPRequestHandler):
if '?options=' in self.path: if '?options=' in self.path:
self._show_person_options(calling_domain, self.path, self._show_person_options(calling_domain, self.path,
self.server.base_dir, self.server.base_dir,
self.server.http_prefix,
self.server.domain, self.server.domain,
self.server.domain_full, self.server.domain_full,
getreq_start_time, getreq_start_time,
self.server.onion_domain,
self.server.i2p_domain,
cookie, self.server.debug, cookie, self.server.debug,
authorized, authorized,
curr_session) curr_session)
@ -23914,7 +23909,7 @@ class PubServer(BaseHTTPRequestHandler):
# an option was chosen from person options screen # an option was chosen from person options screen
# view/follow/block/report # view/follow/block/report
if self.path.endswith('/personoptions'): if self.path.endswith('/personoptions'):
self._person_options(self.path, self._person_options2(self.path,
calling_domain, cookie, calling_domain, cookie,
self.server.base_dir, self.server.base_dir,
self.server.http_prefix, self.server.http_prefix,