kuhyx/signal-bot
1
0
Fork 0
mirror of https://github.com/kuhyx/signal-bot.git synced 2026-07-04 15:43:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: add should_count to message count inside send to group

Browse Source
This commit is contained in:
Krzysztof Rudnicki 2024-10-05 10:15:34 +02:00
parent 0205627e26
commit 3c79bfb4eb
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.py
View File

@ -136,7 +136,7 @@ USER_MESSAGE_COUNT = {}
async def count_messages(message_content, counter): async def count_messages(message_content, counter):
if message_content: if message_content and should_count(message_content):
uuid = extract_source_uuid(message_content) uuid = extract_source_uuid(message_content)
source_name = extract_source_name(message_content) source_name = extract_source_name(message_content)
await counter.update_string_map(uuid, source_name) 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): async def send_to_group(message_content, counter, message):
if message_group_id(message_content) == GROUP_ID: 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) await trigger_command(message_content, GROUP_ID_SEND)
async def remove_attachment(attachment_id): async def remove_attachment(attachment_id):
@ -213,8 +214,6 @@ def is_message_reaction(message):
return False return False
def should_count(message_content): def should_count(message_content):
if message_content.get('destinationNumber', {}) != PHONE_NUMBER:
return False
if message_content.get('sticker') != None: if message_content.get('sticker') != None:
print("not counting because message has a sticker") print("not counting because message has a sticker")
return False return False
@ -231,8 +230,7 @@ async def listen_to_server(counter):
message_content = extract_message_content(message) message_content = extract_message_content(message)
await send_to_group(message_content, counter, message) await send_to_group(message_content, counter, message)
print("message_content.get('sticker') == None: ", message_content.get('sticker') == None, message_content.get('sticker')) print("message_content.get('sticker') == None: ", message_content.get('sticker') == None, message_content.get('sticker'))
if should_count(message_content): if message_content.get('destinationNumber', {}) != PHONE_NUMBER:
print("counting message")
await count_messages(json.loads(message).get('envelope', {}), counter) await count_messages(json.loads(message).get('envelope', {}), counter)
await trigger_command(message_content, PHONE_NUMBER) await trigger_command(message_content, PHONE_NUMBER)
except websockets.ConnectionClosed as e: except websockets.ConnectionClosed as e: