From 6adf9dee3ce014e2cf7914c4d3546ef16448d2e2 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 12 Jun 2022 22:31:53 +0100 Subject: [PATCH] Tidying --- outbox.py | 12 ++++-------- reaction.py | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/outbox.py b/outbox.py index f1fe3aa68..b423c666c 100644 --- a/outbox.py +++ b/outbox.py @@ -60,8 +60,7 @@ from webapp_post import individual_post_as_html from speaker import update_speaker -def _person_receive_update_outbox(recent_posts_cache: {}, - base_dir: str, http_prefix: str, +def _person_receive_update_outbox(base_dir: str, http_prefix: str, nickname: str, domain: str, port: int, message_json: {}, debug: bool) -> None: """ Receive an actor update from c2s @@ -588,14 +587,12 @@ def post_message_to_outbox(session, translate: {}, if debug: print('DEBUG: handle any emoji reaction requests') outbox_reaction(recent_posts_cache, - base_dir, http_prefix, - post_to_nickname, domain, port, + base_dir, post_to_nickname, domain, message_json, debug) if debug: print('DEBUG: handle any undo emoji reaction requests') outbox_undo_reaction(recent_posts_cache, - base_dir, http_prefix, - post_to_nickname, domain, port, + base_dir, post_to_nickname, domain, message_json, debug) if debug: @@ -665,8 +662,7 @@ def post_message_to_outbox(session, translate: {}, if debug: print('DEBUG: handle actor updates from c2s') - _person_receive_update_outbox(recent_posts_cache, - base_dir, http_prefix, + _person_receive_update_outbox(base_dir, http_prefix, post_to_nickname, domain, port, message_json, debug) diff --git a/reaction.py b/reaction.py index 2c13fe589..74ca6dc9e 100644 --- a/reaction.py +++ b/reaction.py @@ -361,8 +361,7 @@ def send_undo_reaction_via_server(base_dir: str, session, def outbox_reaction(recent_posts_cache: {}, - base_dir: str, http_prefix: str, - nickname: str, domain: str, port: int, + base_dir: str, nickname: str, domain: str, message_json: {}, debug: bool) -> None: """ When a reaction request is received by the outbox from c2s """ @@ -405,8 +404,7 @@ def outbox_reaction(recent_posts_cache: {}, def outbox_undo_reaction(recent_posts_cache: {}, - base_dir: str, http_prefix: str, - nickname: str, domain: str, port: int, + base_dir: str, nickname: str, domain: str, message_json: {}, debug: bool) -> None: """ When an undo reaction request is received by the outbox from c2s """