From 146bdcf3b8e579828f45b81bc7a17855e55e733a Mon Sep 17 00:00:00 2001 From: bashrc Date: Sat, 2 May 2026 10:53:31 +0100 Subject: [PATCH] Tidying --- inbox_receive.py | 15 ++++++++++----- inbox_receive_undo.py | 9 ++++++--- tests.py | 3 ++- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/inbox_receive.py b/inbox_receive.py index 20fd679fd..d1d79d020 100644 --- a/inbox_receive.py +++ b/inbox_receive.py @@ -1080,7 +1080,8 @@ def receive_like(recent_posts_cache: {}, not_dm = not is_dm(liked_post_json) timezone = get_account_timezone(base_dir, handle_name, domain) mitm: bool = False - if os.path.isfile(post_filename.replace('.json', '') + '.mitm'): + test_filename = post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if handle_name in min_images_for_accounts: @@ -1330,7 +1331,8 @@ def receive_reaction(recent_posts_cache: {}, not_dm = not is_dm(reaction_post_json) timezone = get_account_timezone(base_dir, handle_name, domain) mitm: bool = False - if os.path.isfile(post_filename.replace('.json', '') + '.mitm'): + test_filename = post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if handle_name in min_images_for_accounts: @@ -1529,7 +1531,8 @@ def receive_zot_reaction(recent_posts_cache: {}, not_dm = not is_dm(reaction_post_json) timezone = get_account_timezone(base_dir, handle_name, domain) mitm: bool = False - if os.path.isfile(post_filename.replace('.json', '') + '.mitm'): + test_filename = post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if handle_name in min_images_for_accounts: @@ -1671,7 +1674,8 @@ def receive_bookmark(recent_posts_cache: {}, not_dm = not is_dm(bookmarked_post_json) timezone = get_account_timezone(base_dir, nickname, domain) mitm: bool = False - if os.path.isfile(post_filename.replace('.json', '') + '.mitm'): + test_filename = post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if nickname in min_images_for_accounts: @@ -2221,7 +2225,8 @@ def receive_question_vote(server, base_dir: str, nickname: str, domain: str, not_dm = not is_dm(question_json) timezone = get_account_timezone(base_dir, nickname, domain) mitm: bool = False - if os.path.isfile(question_post_filename.replace('.json', '') + '.mitm'): + test_filename = question_post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if nickname in min_images_for_accounts: diff --git a/inbox_receive_undo.py b/inbox_receive_undo.py index fe01af108..e7e51e23c 100644 --- a/inbox_receive_undo.py +++ b/inbox_receive_undo.py @@ -266,7 +266,8 @@ def receive_undo_like(recent_posts_cache: {}, not_dm = not is_dm(liked_post_json) timezone = get_account_timezone(base_dir, handle_name, domain) mitm: bool = False - if os.path.isfile(post_filename.replace('.json', '') + '.mitm'): + test_filename = post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if handle_name in min_images_for_accounts: @@ -424,7 +425,8 @@ def receive_undo_reaction(recent_posts_cache: {}, not_dm = not is_dm(reaction_post_json) timezone = get_account_timezone(base_dir, handle_name, domain) mitm: bool = False - if os.path.isfile(post_filename.replace('.json', '') + '.mitm'): + test_filename = post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if handle_name in min_images_for_accounts: @@ -568,7 +570,8 @@ def receive_undo_bookmark(recent_posts_cache: {}, not_dm = not is_dm(bookmarked_post_json) timezone = get_account_timezone(base_dir, nickname, domain) mitm: bool = False - if os.path.isfile(post_filename.replace('.json', '') + '.mitm'): + test_filename = post_filename.replace('.json', '') + '.mitm' + if os.path.isfile(test_filename): mitm = True minimize_all_images: bool = False if nickname in min_images_for_accounts: diff --git a/tests.py b/tests.py index 9fb755aad..264b11e58 100644 --- a/tests.py +++ b/tests.py @@ -1509,8 +1509,9 @@ def test_post_message_between_servers(base_dir: str) -> None: data_dir(alice_dir) + '/alice@' + alice_domain + '/.last_published' assert not os.path.isfile(last_pub_filename) outbox_path = data_dir(alice_dir) + '/alice@' + alice_domain + '/outbox' + test_filename = os.path.join(outbox_path, name) assert len([name for name in os.listdir(outbox_path) - if os.path.isfile(os.path.join(outbox_path, name))]) == 0 + if os.path.isfile(test_filename)]) == 0 low_bandwidth: bool = False signing_priv_key_pem = None translate: dict = {}