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

Tidying

main
Bob Mottram 2022-06-09 11:28:03 +01:00
parent b3fd331381
commit 0fde692c24
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
acceptreject.py
View File

@ -75,7 +75,7 @@ def create_reject(base_dir: str, federation_list: [],
http_prefix, object_json, 'Reject') http_prefix, object_json, 'Reject')
def _accept_follow(base_dir: str, domain: str, message_json: {}, def _accept_follow(base_dir: str, message_json: {},
federation_list: [], debug: bool, federation_list: [], debug: bool,
curr_domain: str, curr_domain: str,
onion_domain: str, i2p_domain: str) -> None: onion_domain: str, i2p_domain: str) -> None:
@ -195,14 +195,8 @@ def _accept_follow(base_dir: str, domain: str, message_json: {},
followed_nickname + '@' + followed_domain) followed_nickname + '@' + followed_domain)
def receive_accept_reject(session, base_dir: str, def receive_accept_reject(base_dir: str, domain: str, message_json: {},
http_prefix: str, domain: str, port: int, federation_list: [], debug: bool, curr_domain: str,
send_threads: [], post_log: [],
cached_webfingers: {},
person_cache: {}, message_json: {},
federation_list: [],
debug: bool,
curr_domain: str,
onion_domain: str, i2p_domain: str) -> bool: onion_domain: str, i2p_domain: str) -> bool:
"""Receives an Accept or Reject within the POST section of HTTPServer """Receives an Accept or Reject within the POST section of HTTPServer
""" """
@ -229,7 +223,7 @@ def receive_accept_reject(session, base_dir: str,
' does not contain a nickname. ' + ' does not contain a nickname. ' +
'Assuming single user instance.') 'Assuming single user instance.')
# receive follow accept # receive follow accept
_accept_follow(base_dir, domain, message_json, federation_list, debug, _accept_follow(base_dir, message_json, federation_list, debug,
curr_domain, onion_domain, i2p_domain) curr_domain, onion_domain, i2p_domain)
if debug: if debug:
print('DEBUG: Uh, ' + message_json['type'] + ', I guess') print('DEBUG: Uh, ' + message_json['type'] + ', I guess')

6
inbox.py
View File

@ -5302,11 +5302,7 @@ def run_inbox_queue(server,
if debug: if debug:
print('DEBUG: No follow requests') print('DEBUG: No follow requests')
if receive_accept_reject(curr_session, if receive_accept_reject(base_dir, domain, queue_json['post'],
base_dir, http_prefix, domain, port,
send_threads, post_log,
cached_webfingers, person_cache,
queue_json['post'],
federation_list, debug, federation_list, debug,
domain, onion_domain, i2p_domain): domain, onion_domain, i2p_domain):
print('Queue: Accept/Reject received from ' + key_id) print('Queue: Accept/Reject received from ' + key_id)