From 392924e06a80f3e2fb8103a8fe9f70e50e3a0919 Mon Sep 17 00:00:00 2001 From: SpudGunMan Date: Wed, 24 Jul 2024 19:11:45 -0700 Subject: [PATCH] Update pong_bot.py --- pong_bot.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pong_bot.py b/pong_bot.py index 2ece5df..9a8292b 100755 --- a/pong_bot.py +++ b/pong_bot.py @@ -115,38 +115,38 @@ def onReceive(packet, interface): # ignore help and welcome messages print(f"{log_timestamp()} Got Own Welcome/Help header. Device:{rxNode} From: {get_name_from_number(message_from_id)}") return - + # If the packet is a DM (Direct Message) respond to it, otherwise validate its a message for us on the channel - if packet['to'] == myNodeNum: + if packet['to'] == myNodeNum or packet['to'] == myNodeNum2: # message is DM to us # check if the message contains a trap word, DMs are always responded to if messageTrap(message_string): - print(f"{log_timestamp()} Received DM: {message_string} on Device:{rxNode} Channel: {channel_number} From: {get_name_from_number(message_from_id)}") + print(f"{log_timestamp()} Received DM: {message_string} on Device:{rxNode} Channel: {channel_number} From: {get_name_from_number(message_from_id, 'long', rxNode)}") # respond with DM - send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id) + send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode) else: # respond with welcome message on DM - print(f"{log_timestamp()} Ignoring DM: {message_string} on Device:{rxNode} From: {get_name_from_number(message_from_id)}") - send_message(welcome_message, channel_number, message_from_id) + print(f"{log_timestamp()} Ignoring DM: {message_string} on Device:{rxNode} From: {get_name_from_number(message_from_id, 'long', rxNode)}") + send_message(welcome_message, channel_number, message_from_id, rxNode) else: # message is on a channel if messageTrap(message_string): - print(f"{log_timestamp()} Received On Device:{rxNode} Channel {channel_number}: {message_string} From: {get_name_from_number(message_from_id)}") + print(f"{log_timestamp()} Received On Device:{rxNode} Channel {channel_number}: {message_string} From: {get_name_from_number(message_from_id, 'long', rxNode)}") if useDMForResponse: # respond to channel message via direct message - send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id) + send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode) else: # or respond to channel message on the channel itself if channel_number == publicChannel: # warning user spamming default channel - print(f"{log_timestamp()} System: Warning spamming default channel not allowed. sending DM to {get_name_from_number(message_from_id)}") + print(f"{log_timestamp()} System: Warning spamming default channel not allowed. sending DM to {get_name_from_number(message_from_id, 'long', rxNode)}") # respond to channel message via direct message - send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id) + send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, message_from_id, rxNode) else: # respond to channel message on the channel itself - send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number) + send_message(auto_response(message_string, snr, rssi, hop, message_from_id, channel_number, rxNode), channel_number, 0, rxNode) else: # add the message to the message history but limit timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")