From 3c79bfb4eb8f8950ff81d54df81ff49b2cdbcaa8 Mon Sep 17 00:00:00 2001 From: Krzysztof Rudnicki Date: Sat, 5 Oct 2024 10:15:34 +0200 Subject: [PATCH] fix: add should_count to message count inside send to group --- main.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index 801c012..a5a347e 100644 --- a/main.py +++ b/main.py @@ -136,7 +136,7 @@ USER_MESSAGE_COUNT = {} async def count_messages(message_content, counter): - if message_content: + if message_content and should_count(message_content): uuid = extract_source_uuid(message_content) source_name = extract_source_name(message_content) await counter.update_string_map(uuid, source_name) @@ -181,6 +181,7 @@ async def trigger_command(message_content, recipient): async def send_to_group(message_content, counter, message): if message_group_id(message_content) == GROUP_ID: + await count_messages(json.loads(message).get('envelope', {}), counter) await trigger_command(message_content, GROUP_ID_SEND) async def remove_attachment(attachment_id): @@ -213,8 +214,6 @@ def is_message_reaction(message): return False def should_count(message_content): - if message_content.get('destinationNumber', {}) != PHONE_NUMBER: - return False if message_content.get('sticker') != None: print("not counting because message has a sticker") return False @@ -231,8 +230,7 @@ async def listen_to_server(counter): message_content = extract_message_content(message) await send_to_group(message_content, counter, message) print("message_content.get('sticker') == None: ", message_content.get('sticker') == None, message_content.get('sticker')) - if should_count(message_content): - print("counting message") + if message_content.get('destinationNumber', {}) != PHONE_NUMBER: await count_messages(json.loads(message).get('envelope', {}), counter) await trigger_command(message_content, PHONE_NUMBER) except websockets.ConnectionClosed as e: