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

Tidying

main
Bob Mottram 2024-04-13 11:43:40 +01:00
parent 9df2e06021
commit dc484364e1
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
daemon_post.py
View File

@ -201,7 +201,12 @@ def daemon_http_post(self) -> None:
self.server.domain, self.server.domain,
self.server.port, self.server.port,
ua_str, self.server.debug, ua_str, self.server.debug,
self.server.registration) self.server.registration,
self.server.domain_full,
self.server.onion_domain,
self.server.i2p_domain,
self.server.manual_follower_approval,
self.server.default_timeline)
self.server.postreq_busy = False self.server.postreq_busy = False
return return

29
daemon_post_login.py
View File

@ -40,7 +40,12 @@ def post_login_screen(self, calling_domain: str, cookie: str,
base_dir: str, http_prefix: str, base_dir: str, http_prefix: str,
domain: str, port: int, domain: str, port: int,
ua_str: str, debug: bool, ua_str: str, debug: bool,
registrations_open: bool) -> None: registrations_open: bool,
domain_full: str,
onion_domain: str,
i2p_domain: str,
manual_follower_approval: bool,
default_timeline: str) -> None:
"""POST to login screen, containing credentials """POST to login screen, containing credentials
""" """
# ensure that there is a minimum delay between failed login # ensure that there is a minimum delay between failed login
@ -95,23 +100,23 @@ def post_login_screen(self, calling_domain: str, cookie: str,
login_url = \ login_url = \
get_instance_url(calling_domain, get_instance_url(calling_domain,
http_prefix, http_prefix,
self.server.domain_full, domain_full,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) + \ i2p_domain) + \
'/login' '/login'
redirect_headers(self, login_url, cookie, calling_domain) redirect_headers(self, login_url, cookie, calling_domain)
return return
if not register_account(base_dir, http_prefix, domain, port, if not register_account(base_dir, http_prefix, domain, port,
login_nickname, login_password, login_nickname, login_password,
self.server.manual_follower_approval): manual_follower_approval):
self.server.postreq_busy = False self.server.postreq_busy = False
login_url = \ login_url = \
get_instance_url(calling_domain, get_instance_url(calling_domain,
http_prefix, http_prefix,
self.server.domain_full, domain_full,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) + \ i2p_domain) + \
'/login' '/login'
redirect_headers(self, login_url, cookie, calling_domain) redirect_headers(self, login_url, cookie, calling_domain)
return return
@ -206,11 +211,11 @@ def post_login_screen(self, calling_domain: str, cookie: str,
tl_url = \ tl_url = \
get_instance_url(calling_domain, get_instance_url(calling_domain,
http_prefix, http_prefix,
self.server.domain_full, domain_full,
self.server.onion_domain, onion_domain,
self.server.i2p_domain) + \ i2p_domain) + \
'/users/' + login_nickname + '/' + \ '/users/' + login_nickname + '/' + \
self.server.default_timeline default_timeline
redirect_headers(self, tl_url, cookie_str, calling_domain) redirect_headers(self, tl_url, cookie_str, calling_domain)
self.server.postreq_busy = False self.server.postreq_busy = False
return return