From aa6f70831ff04e92f108a0dd2f74ab84e8163403 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TC=C2=B2?= <130875305+TheCommsChannel@users.noreply.github.com> Date: Thu, 4 Jul 2024 23:46:22 -0400 Subject: [PATCH] Large number of changes - Changed menu structure to support Web Client - Added Quick Commands - Added Sync process for Channel Dir --- command_handlers.py | 295 ++++++++++++++++++++++++++++++++++++++++-- db_operations.py | 9 +- message_processing.py | 50 +++++-- utils.py | 6 + 4 files changed, 338 insertions(+), 22 deletions(-) diff --git a/command_handlers.py b/command_handlers.py index dd59a0e..6cd22fe 100644 --- a/command_handlers.py +++ b/command_handlers.py @@ -2,6 +2,8 @@ import logging import random import time +from meshtastic import BROADCAST_NUM + from config_init import initialize_config from db_operations import ( add_bulletin, add_mail, delete_mail, @@ -41,16 +43,14 @@ def handle_exit_command(sender_id, interface): def handle_help_command(sender_id, interface, state=None): - title = "TC2 BBS\n" + title = "💾TC2 BBS💾\n" commands = [ - "[M]ail Menu", - "[B]ulletin Menu", - "[S]tats Menu", - "[F]ortune", - "[W]all of Shame", - "[C]hannel Directory", - "EXIT: Exit current menu", - "[H]elp" + "[QCH] - Quick Commands", + "[St]ats Menu", + "[Fo]rtune", + "[WS]Wall of Shame", + "[EXIT]", + "[HELP]" ] if state and 'command' in state: current_command = state['command'] @@ -322,8 +322,7 @@ def handle_mail_steps(sender_id, message, step, state, interface, bbs_nodes): unique_id = add_mail(get_node_id_from_num(sender_id, interface), sender_short_name, recipient_id, subject, content, bbs_nodes, interface) send_message(f"Mail has been posted to the mailbox of {recipient_name}.\n(╯°□°)╯📨📬", sender_id, interface) - # Send notification to the recipient - notification_message = f"You have a new mail message from {sender_short_name}. Check your mailbox by responding to this message with M." + notification_message = f"You have a new mail message from {sender_short_name}. Check your mailbox by responding to this message with CM." send_message(notification_message, recipient_id, interface) update_user_state(sender_id, None) @@ -398,3 +397,277 @@ def handle_channel_directory_steps(sender_id, message, step, state, interface): add_channel(channel_name, channel_url) send_message(f"Your channel '{channel_name}' has been added to the directory.", sender_id, interface) handle_channel_directory_command(sender_id, interface) + + +def handle_send_mail_command(sender_id, message, interface, bbs_nodes): + try: + parts = message.split("|", 3) + if len(parts) != 4: + send_message("Send Mail Quick Command format:\nSM|{short_name}|{subject}|{message}", sender_id, interface) + return + + _, short_name, subject, content = parts + nodes = get_node_info(interface, short_name.lower()) + if not nodes: + send_message(f"Node with short name '{short_name}' not found.", sender_id, interface) + return + if len(nodes) > 1: + send_message(f"Multiple nodes with short name '{short_name}' found. Please be more specific.", sender_id, + interface) + return + + recipient_id = nodes[0]['num'] + recipient_name = get_node_name(recipient_id, interface) + sender_short_name = get_node_short_name(get_node_id_from_num(sender_id, interface), interface) + + unique_id = add_mail(get_node_id_from_num(sender_id, interface), sender_short_name, recipient_id, subject, + content, bbs_nodes, interface) + send_message(f"Mail has been sent to {recipient_name}.", sender_id, interface) + + notification_message = f"You have a new mail message from {sender_short_name}. Check your mailbox by responding to this message with M." + send_message(notification_message, recipient_id, interface) + + except Exception as e: + logging.error(f"Error processing send mail command: {e}") + send_message("Error processing send mail command.", sender_id, interface) + + +def handle_check_mail_command(sender_id, interface): + try: + sender_node_id = get_node_id_from_num(sender_id, interface) + mail = get_mail(sender_node_id) + if not mail: + send_message("You have no new messages.", sender_id, interface) + return + + response = "📬 You have the following messages:\n" + for i, msg in enumerate(mail): + response += f"{i + 1:02d}. From: {msg[1]}, Subject: {msg[2]}, Date: {msg[3]}\n" + response += "\nPlease reply with the number of the message you want to read." + send_message(response, sender_id, interface) + + update_user_state(sender_id, {'command': 'CHECK_MAIL', 'step': 1, 'mail': mail}) + + except Exception as e: + logging.error(f"Error processing check mail command: {e}") + send_message("Error processing check mail command.", sender_id, interface) + + +def handle_read_mail_command(sender_id, message, state, interface): + try: + mail = state.get('mail', []) + message_number = int(message) - 1 + + if message_number < 0 or message_number >= len(mail): + send_message("Invalid message number. Please try again.", sender_id, interface) + return + + mail_id = mail[message_number][0] + sender_node_id = get_node_id_from_num(sender_id, interface) + sender, date, subject, content, unique_id = get_mail_content(mail_id, sender_node_id) + response = f"Date: {date}\nFrom: {sender}\nSubject: {subject}\n\n{content}" + send_message(response, sender_id, interface) + send_message("Would you like to delete this message now that you've read it? Y/N", sender_id, interface) + update_user_state(sender_id, {'command': 'CHECK_MAIL', 'step': 2, 'mail_id': mail_id, 'unique_id': unique_id}) + + except ValueError: + send_message("Invalid input. Please enter a valid message number.", sender_id, interface) + except Exception as e: + logging.error(f"Error processing read mail command: {e}") + send_message("Error processing read mail command.", sender_id, interface) + + +def handle_delete_mail_confirmation(sender_id, message, state, interface, bbs_nodes): + try: + choice = message.lower() + if choice == 'y': + unique_id = state['unique_id'] + sender_node_id = get_node_id_from_num(sender_id, interface) + delete_mail(unique_id, sender_node_id, bbs_nodes, interface) + send_message("The message has been deleted 🗑️", sender_id, interface) + else: + send_message("The message has been kept in your inbox.✉️", sender_id, interface) + + update_user_state(sender_id, None) + + except Exception as e: + logging.error(f"Error processing delete mail confirmation: {e}") + send_message("Error processing delete mail confirmation.", sender_id, interface) + + +def handle_post_bulletin_command(sender_id, message, interface, bbs_nodes): + try: + parts = message.split("|", 3) + if len(parts) != 4: + send_message("Post Bulletin Quick Command format:\nPB|{board_name}|{subject}|{content}", sender_id, interface) + return + + _, board_name, subject, content = parts + sender_short_name = get_node_short_name(get_node_id_from_num(sender_id, interface), interface) + + unique_id = add_bulletin(board_name, sender_short_name, subject, content, bbs_nodes, interface) + send_message(f"Your bulletin '{subject}' has been posted to {board_name}.", sender_id, interface) + + # New logic to send group chat notification for urgent bulletins + if board_name.lower() == "urgent": + notification_message = f"💥NEW URGENT BULLETIN💥\nFrom: {sender_short_name}\nTitle: {subject}" + send_message(notification_message, BROADCAST_NUM, interface) + + except Exception as e: + logging.error(f"Error processing post bulletin command: {e}") + send_message("Error processing post bulletin command.", sender_id, interface) + + +def handle_check_bulletin_command(sender_id, message, interface): + try: + parts = message.split("|", 2) + if len(parts) != 2: + send_message("Check Bulletins Quick Command format:\nCB|{board_name}", sender_id, interface) + return + + _, board_name = parts + bulletins = get_bulletins(board_name) + if not bulletins: + send_message(f"No bulletins available on {board_name} board.", sender_id, interface) + return + + response = f"📰 Bulletins on {board_name} board:\n" + for i, bulletin in enumerate(bulletins): + response += f"[{i+1:02d}] Subject: {bulletin[1]}, From: {bulletin[2]}, Date: {bulletin[3]}\n" + response += "\nPlease reply with the number of the bulletin you want to read." + send_message(response, sender_id, interface) + + update_user_state(sender_id, {'command': 'CHECK_BULLETIN', 'step': 1, 'board_name': board_name, 'bulletins': bulletins}) + + except Exception as e: + logging.error(f"Error processing check bulletin command: {e}") + send_message("Error processing check bulletin command.", sender_id, interface) + +def handle_read_bulletin_command(sender_id, message, state, interface): + try: + bulletins = state.get('bulletins', []) + message_number = int(message) - 1 + + if message_number < 0 or message_number >= len(bulletins): + send_message("Invalid bulletin number. Please try again.", sender_id, interface) + return + + bulletin_id = bulletins[message_number][0] + sender, date, subject, content, unique_id = get_bulletin_content(bulletin_id) + response = f"Date: {date}\nFrom: {sender}\nSubject: {subject}\n\n{content}" + send_message(response, sender_id, interface) + + update_user_state(sender_id, None) + + except ValueError: + send_message("Invalid input. Please enter a valid bulletin number.", sender_id, interface) + except Exception as e: + logging.error(f"Error processing read bulletin command: {e}") + send_message("Error processing read bulletin command.", sender_id, interface) + + +def handle_post_channel_command(sender_id, message, interface): + try: + parts = message.split("|", 3) + if len(parts) != 3: + send_message("Post Channel Quick Command format:\nCHP|{channel_name}|{channel_url}", sender_id, interface) + return + + _, channel_name, channel_url = parts + bbs_nodes = interface.bbs_nodes + add_channel(channel_name, channel_url, bbs_nodes, interface) + send_message(f"Channel '{channel_name}' has been added to the directory.", sender_id, interface) + + except Exception as e: + logging.error(f"Error processing post channel command: {e}") + send_message("Error processing post channel command.", sender_id, interface) + + +def handle_check_channel_command(sender_id, interface): + try: + channels = get_channels() + if not channels: + send_message("No channels available in the directory.", sender_id, interface) + return + + response = "📚 Available Channels:\n" + for i, channel in enumerate(channels): + response += f"{i + 1:02d}. Name: {channel[0]}\n" + response += "\nPlease reply with the number of the channel you want to view." + send_message(response, sender_id, interface) + + update_user_state(sender_id, {'command': 'CHECK_CHANNEL', 'step': 1, 'channels': channels}) + + except Exception as e: + logging.error(f"Error processing check channel command: {e}") + send_message("Error processing check channel command.", sender_id, interface) + + +def handle_read_channel_command(sender_id, message, state, interface): + try: + channels = state.get('channels', []) + message_number = int(message) - 1 + + if message_number < 0 or message_number >= len(channels): + send_message("Invalid channel number. Please try again.", sender_id, interface) + return + + channel_name, channel_url = channels[message_number] + response = f"Channel Name: {channel_name}\nChannel URL: {channel_url}" + send_message(response, sender_id, interface) + + update_user_state(sender_id, None) + + except ValueError: + send_message("Invalid input. Please enter a valid channel number.", sender_id, interface) + except Exception as e: + logging.error(f"Error processing read channel command: {e}") + send_message("Error processing read channel command.", sender_id, interface) + + +def handle_list_channels_command(sender_id, interface): + try: + channels = get_channels() + if not channels: + send_message("No channels available in the directory.", sender_id, interface) + return + + response = "📚 Available Channels:\n" + for i, channel in enumerate(channels): + response += f"{i+1:02d}. Name: {channel[0]}\n" + response += "\nPlease reply with the number of the channel you want to view." + send_message(response, sender_id, interface) + + update_user_state(sender_id, {'command': 'LIST_CHANNELS', 'step': 1, 'channels': channels}) + + except Exception as e: + logging.error(f"Error processing list channels command: {e}") + send_message("Error processing list channels command.", sender_id, interface) + +def handle_read_channel_command(sender_id, message, state, interface): + try: + channels = state.get('channels', []) + message_number = int(message) - 1 + + if message_number < 0 or message_number >= len(channels): + send_message("Invalid channel number. Please try again.", sender_id, interface) + return + + channel_name, channel_url = channels[message_number] + response = f"Channel Name: {channel_name}\nChannel URL: {channel_url}" + send_message(response, sender_id, interface) + + update_user_state(sender_id, None) + + except ValueError: + send_message("Invalid input. Please enter a valid channel number.", sender_id, interface) + except Exception as e: + logging.error(f"Error processing read channel command: {e}") + send_message("Error processing read channel command.", sender_id, interface) + + +def handle_quick_help_command(sender_id, interface): + response = ("🏃QUICK COMMANDS🏃‍➡️\nSend command and pipe symbol -> | to learn how to use each one\nSM| - Send " + "Mail\nCM - Check Mail (No Pipe)\nPB| - Post Bulletin\nCB| - Check Bulletins\nCHP| - Post " + "Channel\nCHL - List Channels (no Pipe)") + send_message(response, sender_id, interface) \ No newline at end of file diff --git a/db_operations.py b/db_operations.py index 0f366c7..de60722 100644 --- a/db_operations.py +++ b/db_operations.py @@ -10,7 +10,7 @@ from utils import ( send_bulletin_to_bbs_nodes, send_delete_bulletin_to_bbs_nodes, send_delete_mail_to_bbs_nodes, - send_mail_to_bbs_nodes, send_message + send_mail_to_bbs_nodes, send_message, send_channel_to_bbs_nodes ) @@ -51,12 +51,16 @@ def initialize_database(): conn.commit() print("Database schema initialized.") -def add_channel(name, url): +def add_channel(name, url, bbs_nodes=None, interface=None): conn = get_db_connection() c = conn.cursor() c.execute("INSERT INTO channels (name, url) VALUES (?, ?)", (name, url)) conn.commit() + if bbs_nodes and interface: + send_channel_to_bbs_nodes(name, url, bbs_nodes, interface) + + def get_channels(): conn = get_db_connection() c = conn.cursor() @@ -85,6 +89,7 @@ def add_bulletin(board, sender_short_name, subject, content, bbs_nodes, interfac return unique_id + def get_bulletins(board): conn = get_db_connection() c = conn.cursor() diff --git a/message_processing.py b/message_processing.py index 1efc252..766b266 100644 --- a/message_processing.py +++ b/message_processing.py @@ -6,21 +6,22 @@ from command_handlers import ( handle_mail_command, handle_bulletin_command, handle_exit_command, handle_help_command, handle_stats_command, handle_fortune_command, handle_bb_steps, handle_mail_steps, handle_stats_steps, handle_wall_of_shame_command, - handle_channel_directory_command, handle_channel_directory_steps + handle_channel_directory_command, handle_channel_directory_steps, handle_send_mail_command, + handle_read_mail_command, handle_check_mail_command, handle_delete_mail_confirmation, handle_post_bulletin_command, + handle_check_bulletin_command, handle_read_bulletin_command, handle_read_channel_command, + handle_post_channel_command, handle_list_channels_command, handle_quick_help_command ) -from db_operations import add_bulletin, add_mail, delete_bulletin, delete_mail, get_db_connection +from db_operations import add_bulletin, add_mail, delete_bulletin, delete_mail, get_db_connection, add_channel from utils import get_user_state, get_node_short_name, get_node_id_from_num, send_message command_handlers = { - "m": handle_mail_command, - "b": handle_bulletin_command, - "s": handle_stats_command, - "f": handle_fortune_command, - "w": handle_wall_of_shame_command, + "qch": handle_quick_help_command, + "st": handle_stats_command, + "fo": handle_fortune_command, + "ws": handle_wall_of_shame_command, "exit": handle_exit_command, - "h": handle_help_command, - "c": handle_channel_directory_command + "help": handle_help_command } def process_message(sender_id, message, interface, is_sync_message=False): @@ -49,6 +50,10 @@ def process_message(sender_id, message, interface, is_sync_message=False): logging.info(f"Processing delete mail with unique_id: {unique_id}") recipient_id = get_recipient_id_by_mail(unique_id) # Fetch the recipient_id using this helper function delete_mail(unique_id, recipient_id, [], interface) + elif message.startswith("CHANNEL|"): + parts = message.split("|") + channel_name, channel_url = parts[1], parts[2] + add_channel(channel_name, channel_url) else: if message_lower in command_handlers: command_handlers[message_lower](sender_id, interface) @@ -64,9 +69,36 @@ def process_message(sender_id, message, interface, is_sync_message=False): handle_stats_steps(sender_id, message, step, interface, bbs_nodes) elif command == 'CHANNEL_DIRECTORY': handle_channel_directory_steps(sender_id, message, step, state, interface) + elif command == 'CHECK_MAIL': + if step == 1: + handle_read_mail_command(sender_id, message, state, interface) + elif step == 2: + handle_delete_mail_confirmation(sender_id, message, state, interface, bbs_nodes) + elif command == 'CHECK_BULLETIN': + if step == 1: + handle_read_bulletin_command(sender_id, message, state, interface) + elif command == 'CHECK_CHANNEL': + if step == 1: + handle_read_channel_command(sender_id, message, state, interface) + elif command == 'LIST_CHANNELS': + if step == 1: + handle_read_channel_command(sender_id, message, state, interface) + elif message.startswith("SM|"): + handle_send_mail_command(sender_id, message, interface, bbs_nodes) + elif message.startswith("CM"): + handle_check_mail_command(sender_id, interface) + elif message.startswith("PB|"): + handle_post_bulletin_command(sender_id, message, interface, bbs_nodes) + elif message.startswith("CB|"): + handle_check_bulletin_command(sender_id, message, interface) + elif message.startswith("CHP|"): + handle_post_channel_command(sender_id, message, interface) + elif message.startswith("CHL"): + handle_list_channels_command(sender_id, interface) else: handle_help_command(sender_id, interface) + def on_receive(packet, interface): try: if 'decoded' in packet and packet['decoded']['portnum'] == 'TEXT_MESSAGE_APP': diff --git a/utils.py b/utils.py index 4fa3009..4c4c360 100644 --- a/utils.py +++ b/utils.py @@ -71,3 +71,9 @@ def send_delete_mail_to_bbs_nodes(unique_id, bbs_nodes, interface): logging.info(f"SERVER SYNC: Sending delete mail sync message with unique_id: {unique_id}") for node_id in bbs_nodes: send_message(message, node_id, interface) + + +def send_channel_to_bbs_nodes(name, url, bbs_nodes, interface): + message = f"CHANNEL|{name}|{url}" + for node_id in bbs_nodes: + send_message(message, node_id, interface)