mudhorn/TC2-BBS-mesh
1
0
Fork 1
mirror of https://github.com/TheCommsChannel/TC2-BBS-mesh.git synced 2025-03-05 20:51:53 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 880f93d3ad into b778b8b6cd

Browse source
This commit is contained in:
noon92 2024-09-24 15:14:36 +03:00 committed by GitHub
parent b778b8b6cd 880f93d3ad
commit ba5f6683fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
command_handlers.py
View file

@ -61,10 +61,10 @@ def handle_help_command(sender_id, interface, menu_name=None):
response = build_menu(utilities_menu_items, "🛠️Utilities Menu🛠️") response = build_menu(utilities_menu_items, "🛠️Utilities Menu🛠️")
else: else:
update_user_state(sender_id, {'command': 'MAIN_MENU', 'step': 1}) # Reset to main menu state update_user_state(sender_id, {'command': 'MAIN_MENU', 'step': 1}) # Reset to main menu state
response = build_menu(main_menu_items, "💾TC² BBS💾") mail = get_mail(get_node_id_from_num(sender_id, interface))
response = build_menu(main_menu_items, f"💾TC² BBS💾 (✉️:{len(mail)})")
send_message(response, sender_id, interface) send_message(response, sender_id, interface)
def get_node_name(node_id, interface): def get_node_name(node_id, interface):
node_info = interface.nodes.get(node_id) node_info = interface.nodes.get(node_id)
if node_info: if node_info:

2
message_processing.py
View file

@ -186,7 +186,7 @@ def on_receive(packet, interface):
sender_short_name = get_node_short_name(sender_node_id, interface) sender_short_name = get_node_short_name(sender_node_id, interface)
receiver_short_name = get_node_short_name(get_node_id_from_num(to_id, interface), receiver_short_name = get_node_short_name(get_node_id_from_num(to_id, interface),
interface) if to_id else "Group Chat" interface) if to_id else "Group Chat"
logging.info(f"Received message from user '{sender_short_name}' to {receiver_short_name}: {message_string}") logging.info(f"Received message from user '{sender_short_name}' ({sender_node_id}) to {receiver_short_name}: {message_string}")
bbs_nodes = interface.bbs_nodes bbs_nodes = interface.bbs_nodes
is_sync_message = any(message_string.startswith(prefix) for prefix in is_sync_message = any(message_string.startswith(prefix) for prefix in

5
utils.py
View file

@ -20,10 +20,11 @@ def send_message(message, destination, interface):
d = interface.sendText( d = interface.sendText(
text=chunk, text=chunk,
destinationId=destination, destinationId=destination,
wantAck=False, wantAck=True,
wantResponse=False wantResponse=False
) )
logging.info(f"REPLY SEND ID={d.id}") destid = get_node_id_from_num(destination, interface)
logging.info(f"Sending message to user '{get_node_short_name(destid, interface)}' ({destid}) with sendID {d.id}: \'{chunk.replace("\n", "\\n")}\'")
except Exception as e: except Exception as e:
logging.info(f"REPLY SEND ERROR {e.message}") logging.info(f"REPLY SEND ERROR {e.message}")