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

Fix missing server parameters

merge-requests/30/head
Bob Mottram 2022-03-14 13:45:42 +00:00
parent a2e864a1bc
commit 5730d7bff0
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon.py
View File

@ -20784,7 +20784,7 @@ def run_daemon(crawlers_allowed: [],
print('THREAD: Creating inbox queue') print('THREAD: Creating inbox queue')
httpd.thrInboxQueue = \ httpd.thrInboxQueue = \
thread_with_trace(target=run_inbox_queue, thread_with_trace(target=run_inbox_queue,
args=(httpd.recent_posts_cache, args=(httpd, httpd.recent_posts_cache,
httpd.max_recent_posts, httpd.max_recent_posts,
project_version, project_version,
base_dir, http_prefix, httpd.send_threads, base_dir, http_prefix, httpd.send_threads,

22
inbox.py
View File

@ -2671,7 +2671,7 @@ def _group_handle(base_dir: str, handle: str) -> bool:
return actor_json['type'] == 'Group' return actor_json['type'] == 'Group'
def _send_to_group_members(session, session_onion, session_i2p, def _send_to_group_members(server, session, session_onion, session_i2p,
base_dir: str, handle: str, port: int, base_dir: str, handle: str, port: int,
post_json_object: {}, post_json_object: {},
http_prefix: str, federation_list: [], http_prefix: str, federation_list: [],
@ -2735,7 +2735,7 @@ def _send_to_group_members(session, session_onion, session_i2p,
debug, __version__, signing_priv_key_pem, debug, __version__, signing_priv_key_pem,
curr_domain, onion_domain, i2p_domain) curr_domain, onion_domain, i2p_domain)
send_to_followers_thread(session, session_onion, session_i2p, send_to_followers_thread(server, session, session_onion, session_i2p,
base_dir, nickname, domain, base_dir, nickname, domain,
onion_domain, i2p_domain, port, onion_domain, i2p_domain, port,
http_prefix, federation_list, http_prefix, federation_list,
@ -3063,7 +3063,7 @@ def _is_valid_dm(base_dir: str, nickname: str, domain: str, port: int,
return True return True
def _receive_question_vote(base_dir: str, nickname: str, domain: str, def _receive_question_vote(server, base_dir: str, nickname: str, domain: str,
http_prefix: str, handle: str, debug: bool, http_prefix: str, handle: str, debug: bool,
post_json_object: {}, recent_posts_cache: {}, post_json_object: {}, recent_posts_cache: {},
session, session_onion, session_i2p, session, session_onion, session_i2p,
@ -3143,7 +3143,7 @@ def _receive_question_vote(base_dir: str, nickname: str, domain: str,
question_json['type'] = 'Update' question_json['type'] = 'Update'
shared_items_federated_domains = [] shared_items_federated_domains = []
shared_item_federation_tokens = {} shared_item_federation_tokens = {}
send_to_followers_thread(session, session_onion, session_i2p, send_to_followers_thread(server, session, session_onion, session_i2p,
base_dir, nickname, domain, base_dir, nickname, domain,
onion_domain, i2p_domain, port, onion_domain, i2p_domain, port,
http_prefix, federation_list, http_prefix, federation_list,
@ -3271,7 +3271,8 @@ def _check_for_git_patches(base_dir: str, nickname: str, domain: str,
return 0 return 0
def _inbox_after_initial(recent_posts_cache: {}, max_recent_posts: int, def _inbox_after_initial(server,
recent_posts_cache: {}, max_recent_posts: int,
session, session_onion, session_i2p, session, session_onion, session_i2p,
key_id: str, handle: str, message_json: {}, key_id: str, handle: str, message_json: {},
base_dir: str, http_prefix: str, send_threads: [], base_dir: str, http_prefix: str, send_threads: [],
@ -3558,7 +3559,7 @@ def _inbox_after_initial(recent_posts_cache: {}, max_recent_posts: int,
populate_replies(base_dir, http_prefix, domain, post_json_object, populate_replies(base_dir, http_prefix, domain, post_json_object,
max_replies, debug) max_replies, debug)
_receive_question_vote(base_dir, nickname, domain, _receive_question_vote(server, base_dir, nickname, domain,
http_prefix, handle, debug, http_prefix, handle, debug,
post_json_object, recent_posts_cache, post_json_object, recent_posts_cache,
session, session_onion, session_i2p, session, session_onion, session_i2p,
@ -3730,7 +3731,8 @@ def _inbox_after_initial(recent_posts_cache: {}, max_recent_posts: int,
# send the post out to group members # send the post out to group members
if is_group: if is_group:
_send_to_group_members(session, session_onion, session_i2p, _send_to_group_members(server,
session, session_onion, session_i2p,
base_dir, handle, port, base_dir, handle, port,
post_json_object, post_json_object,
http_prefix, federation_list, http_prefix, federation_list,
@ -4239,7 +4241,8 @@ def _receive_follow_request(session, session_onion, session_i2p,
this_domain, onion_domain, i2p_domain) this_domain, onion_domain, i2p_domain)
def run_inbox_queue(recent_posts_cache: {}, max_recent_posts: int, def run_inbox_queue(server,
recent_posts_cache: {}, max_recent_posts: int,
project_version: str, project_version: str,
base_dir: str, http_prefix: str, base_dir: str, http_prefix: str,
send_threads: [], post_log: [], send_threads: [], post_log: [],
@ -4725,7 +4728,8 @@ def run_inbox_queue(recent_posts_cache: {}, max_recent_posts: int,
destination = \ destination = \
queue_json['destination'].replace(inbox_handle, handle) queue_json['destination'].replace(inbox_handle, handle)
languages_understood = [] languages_understood = []
_inbox_after_initial(recent_posts_cache, _inbox_after_initial(server,
recent_posts_cache,
max_recent_posts, max_recent_posts,
session, session_onion, session_i2p, session, session_onion, session_i2p,
key_id, handle, key_id, handle,