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-13 10:08:53 +01:00
parent 8b193396d1
commit 0cd4730ac9
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon_post.py
View File

@ -563,7 +563,9 @@ def daemon_http_post(self) -> None:
self.server.onion_domain, self.server.onion_domain,
self.server.i2p_domain, self.server.i2p_domain,
access_keys, access_keys,
self.server.default_timeline) self.server.default_timeline,
self.server.access_keys,
self.server.key_shortcuts)
self.server.postreq_busy = False self.server.postreq_busy = False
return return

19
daemon_post_keys.py
View File

@ -19,7 +19,8 @@ def keyboard_shortcuts(self, calling_domain: str, cookie: str,
base_dir: str, http_prefix: str, nickname: str, base_dir: str, http_prefix: str, nickname: str,
domain: str, domain_full: str, domain: str, domain_full: str,
onion_domain: str, i2p_domain: str, onion_domain: str, i2p_domain: str,
access_keys: {}, default_timeline: str) -> None: access_keys2: {}, default_timeline: str,
access_keys: {}, key_shortcuts: {}) -> None:
"""Receive POST from webapp_accesskeys """Receive POST from webapp_accesskeys
""" """
users_path = '/users/' + nickname users_path = '/users/' + nickname
@ -67,10 +68,10 @@ def keyboard_shortcuts(self, calling_domain: str, cookie: str,
return return
save_keys = False save_keys = False
access_keys_template = self.server.access_keys access_keys_template = access_keys
for variable_name, _ in access_keys_template.items(): for variable_name, _ in access_keys_template.items():
if not access_keys.get(variable_name): if not access_keys2.get(variable_name):
access_keys[variable_name] = \ access_keys2[variable_name] = \
access_keys_template[variable_name] access_keys_template[variable_name]
variable_name2 = variable_name.replace(' ', '_') variable_name2 = variable_name.replace(' ', '_')
@ -81,16 +82,16 @@ def keyboard_shortcuts(self, calling_domain: str, cookie: str,
if new_key: if new_key:
if len(new_key) > 1: if len(new_key) > 1:
new_key = new_key[0] new_key = new_key[0]
if new_key != access_keys[variable_name]: if new_key != access_keys2[variable_name]:
access_keys[variable_name] = new_key access_keys2[variable_name] = new_key
save_keys = True save_keys = True
if save_keys: if save_keys:
access_keys_filename = \ access_keys_filename = \
acct_dir(base_dir, nickname, domain) + '/access_keys.json' acct_dir(base_dir, nickname, domain) + '/access_keys.json'
save_json(access_keys, access_keys_filename) save_json(access_keys2, access_keys_filename)
if not self.server.key_shortcuts.get(nickname): if not key_shortcuts.get(nickname):
self.server.key_shortcuts[nickname] = access_keys.copy() key_shortcuts[nickname] = access_keys2.copy()
# redirect back from key shortcuts screen # redirect back from key shortcuts screen
if calling_domain.endswith('.onion') and onion_domain: if calling_domain.endswith('.onion') and onion_domain: