From ab154b2934d754a34d1bb75cb309d7d139535ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TC=C2=B2?= <130875305+TheCommsChannel@users.noreply.github.com> Date: Tue, 9 Jul 2024 11:57:38 -0400 Subject: [PATCH] Menu Structure Changes Menu structure changes to improve performance --- command_handlers.py | 235 ++++++++++++++++-------------------------- example_config.ini | 34 ------ message_processing.py | 157 +++++++++++++++++++--------- server.py | 4 +- 4 files changed, 198 insertions(+), 232 deletions(-) delete mode 100644 example_config.ini diff --git a/command_handlers.py b/command_handlers.py index 6cd22fe..9e96746 100644 --- a/command_handlers.py +++ b/command_handlers.py @@ -4,7 +4,6 @@ import time from meshtastic import BROADCAST_NUM -from config_init import initialize_config from db_operations import ( add_bulletin, add_mail, delete_mail, get_bulletin_content, get_bulletins, @@ -18,6 +17,21 @@ from utils import ( ) +def handle_help_command(sender_id, interface, menu_name=None): + if menu_name: + update_user_state(sender_id, {'command': 'MENU', 'menu': menu_name, 'step': 1}) + if menu_name == 'bbs': + response = "📰BBS Menu📰\n[M]ail\n[B]ulletins\n[C]hannel Dir\nE[X]IT" + elif menu_name == 'utilities': + response = "🛠️Utilities Menu🛠️\n[S]tats\n[F]ortune\n[W]all of Shame\nE[X]IT" + else: + update_user_state(sender_id, {'command': 'MAIN_MENU', 'step': 1}) # Reset to main menu state + response = "💾TC² BBS💾\n[Q]uick Commands\n[B]BS\n[U]tilities\nE[X]IT" + send_message(response, sender_id, interface) + + + + def get_node_name(node_id, interface): node_info = interface.nodes.get(node_id) if node_info: @@ -26,15 +40,16 @@ def get_node_name(node_id, interface): def handle_mail_command(sender_id, interface): - response = "✉️ MAIL MENU ✉️\nWhat would you like to do with mail?\n[0]Read [1]Send [2]Exit" + response = "✉️Mail Menu✉️\nWhat would you like to do with mail?\n[R]ead [S]end E[X]IT" send_message(response, sender_id, interface) update_user_state(sender_id, {'command': 'MAIL', 'step': 1}) + def handle_bulletin_command(sender_id, interface): - response = "📰 BULLETIN MENU 📰\nWhich board would you like to enter?\n[0]General [1]Info [2]News [3]Urgent [4]Exit" + response = "📰Bulletin Menu📰\nWhich board would you like to enter?\n[G]eneral [I]nfo [N]ews [U]rgent" send_message(response, sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 1}) + update_user_state(sender_id, {'command': 'BULLETIN_MENU', 'step': 1}) def handle_exit_command(sender_id, interface): @@ -42,45 +57,8 @@ def handle_exit_command(sender_id, interface): update_user_state(sender_id, None) -def handle_help_command(sender_id, interface, state=None): - title = "💾TC2 BBS💾\n" - commands = [ - "[QCH] - Quick Commands", - "[St]ats Menu", - "[Fo]rtune", - "[WS]Wall of Shame", - "[EXIT]", - "[HELP]" - ] - if state and 'command' in state: - current_command = state['command'] - if current_command == 'MAIL': - commands = [ - "[0]Read Mail", - "[1]Send Mail", - "[2]Exit Mail Menu" - ] - elif current_command == 'BULLETIN': - commands = [ - "[0]General Board", - "[1]Info Board", - "[2]News Board", - "[3]Urgent Board", - "[4]Exit Bulletin Menu" - ] - elif current_command == 'STATS': - commands = [ - "[0]Total Nodes", - "[1]Total HW Models", - "[2]Total Roles", - "[3]Back" - ] - response = title + "Available commands:\n" + "\n".join(commands) - send_message(response, sender_id, interface) - - def handle_stats_command(sender_id, interface): - response = "What stats would you like to view?\n[0]Node Numbers [1]Hardware [2]Roles [3]Main Menu" + response = "📊Stats Menu📊\nWhat stats would you like to view?\n[N]odes [H]ardware [R]oles E[X]IT" send_message(response, sender_id, interface) update_user_state(sender_id, {'command': 'STATS', 'step': 1}) @@ -99,18 +77,34 @@ def handle_fortune_command(sender_id, interface): send_message(f"Error generating fortune: {e}", sender_id, interface) -def handle_stats_steps(sender_id, message, step, interface, bbs_nodes): +def handle_stats_steps(sender_id, message, step, interface): if step == 1: - choice = message.upper() - if choice == '3': + choice = message.lower() + if choice == 'x': handle_help_command(sender_id, interface) return - choice = int(choice) - if choice == 0: - response = "Select time period for total nodes:\n[0]ALL [1]Last 24 Hours [2]Last 8 Hours [3]Last Hour" + elif choice == 'n': + current_time = int(time.time()) + timeframes = { + "All time": None, + "Last 24 hours": 86400, + "Last 8 hours": 28800, + "Last hour": 3600 + } + total_nodes_summary = [] + + for period, seconds in timeframes.items(): + if seconds is None: + total_nodes = len(interface.nodes) + else: + time_limit = current_time - seconds + total_nodes = sum(1 for node in interface.nodes.values() if node.get('lastHeard', 0) >= time_limit) + total_nodes_summary.append(f"- {period}: {total_nodes}") + + response = "Total nodes seen:\n" + "\n".join(total_nodes_summary) send_message(response, sender_id, interface) - update_user_state(sender_id, {'command': 'STATS', 'step': 2}) - elif choice == 1: + handle_stats_command(sender_id, interface) + elif choice == 'h': hw_models = {} for node in interface.nodes.values(): hw_model = node['user'].get('hwModel', 'Unknown') @@ -118,7 +112,7 @@ def handle_stats_steps(sender_id, message, step, interface, bbs_nodes): response = "Hardware Models:\n" + "\n".join([f"{model}: {count}" for model, count in hw_models.items()]) send_message(response, sender_id, interface) handle_stats_command(sender_id, interface) - elif choice == 2: + elif choice == 'r': roles = {} for node in interface.nodes.values(): role = node['user'].get('role', 'Unknown') @@ -127,94 +121,48 @@ def handle_stats_steps(sender_id, message, step, interface, bbs_nodes): send_message(response, sender_id, interface) handle_stats_command(sender_id, interface) - elif step == 2: - choice = int(message) - current_time = int(time.time()) - if choice == 0: - total_nodes = len(interface.nodes) - send_message(f"Total nodes seen: {total_nodes}", sender_id, interface) - else: - time_limits = [86400, 28800, 3600] # Last 24 hours, Last 8 hours, Last hour - time_limit = current_time - time_limits[choice - 1] - total_nodes = 0 - for node in interface.nodes.values(): - last_heard = node.get('lastHeard', 0) - if last_heard is not None and last_heard >= time_limit: - total_nodes += 1 - logging.info(f"Node {node.get('user', {}).get('longName', 'Unknown')} heard at {last_heard}, within limit {time_limit}") - timeframes = ["24 hours", "8 hours", "hour"] - send_message(f"Total nodes seen in the last {timeframes[choice - 1]}: {total_nodes}", sender_id, interface) - handle_stats_steps(sender_id, '0', 1, interface, bbs_nodes) def handle_bb_steps(sender_id, message, step, state, interface, bbs_nodes): boards = {0: "General", 1: "Info", 2: "News", 3: "Urgent"} - if step == 1: - if message == '4': - handle_help_command(sender_id, interface) + if message.lower() == 'e': + handle_help_command(sender_id, interface, 'bbs') return - board_name = boards.get(int(message)) - if board_name: - response = f"What would you like to do in the {board_name} board?\n[0]View Bulletins [1]Post Bulletin [2]Exit" - send_message(response, sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 2, 'board': board_name}) - else: - handle_help_command(sender_id, interface) - update_user_state(sender_id, None) + board_name = state['board'] + response = f"What would you like to do in the {board_name} board?\n[R]ead [P]ost" + send_message(response, sender_id, interface) + update_user_state(sender_id, {'command': 'BULLETIN_ACTION', 'step': 2, 'board': board_name}) elif step == 2: - if message == '2': - # Return to the bulletin menu - response = "📰 BULLETIN MENU 📰\nWhich board would you like to enter?\n[0]General [1]Info [2]News [3]Urgent [4]Exit" - send_message(response, sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 1}) - return - if message == '0': - board_name = state['board'] + board_name = state['board'] + if message.lower() == 'r': bulletins = get_bulletins(board_name) - if (bulletins): + if bulletins: send_message(f"Select a bulletin number to view from {board_name}:", sender_id, interface) for bulletin in bulletins: send_message(f"[{bulletin[0]}] {bulletin[1]}", sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 3, 'board': board_name}) + update_user_state(sender_id, {'command': 'BULLETIN_READ', 'step': 3, 'board': board_name}) else: send_message(f"No bulletins in {board_name}.", sender_id, interface) - # Go back to the board menu - response = f"What would you like to do in the {board_name} board?\n[0]View Bulletins [1]Post Bulletin [2]Exit" - send_message(response, sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 2, 'board': board_name}) - - elif message == '1': + handle_bb_steps(sender_id, 'e', 1, state, interface, bbs_nodes) + elif message.lower() == 'p': send_message("What is the subject of your bulletin? Keep it short.", sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 4, 'board': state['board']}) + update_user_state(sender_id, {'command': 'BULLETIN_POST', 'step': 4, 'board': board_name}) elif step == 3: bulletin_id = int(message) sender_short_name, date, subject, content, unique_id = get_bulletin_content(bulletin_id) send_message(f"From: {sender_short_name}\nDate: {date}\nSubject: {subject}\n- - - - - - -\n{content}", sender_id, interface) board_name = state['board'] - response = f"What would you like to do in the {board_name} board?\n[0]View Bulletins [1]Post Bulletin [2]Exit" - send_message(response, sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 2, 'board': board_name}) + handle_bb_steps(sender_id, 'e', 1, state, interface, bbs_nodes) elif step == 4: subject = message send_message("Send the contents of your bulletin. Send a message with END when finished.", sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 6, 'board': state['board'], 'subject': subject, 'content': ''}) + update_user_state(sender_id, {'command': 'BULLETIN_POST_CONTENT', 'step': 5, 'board': state['board'], 'subject': subject, 'content': ''}) elif step == 5: - if message.lower() == "y": - bulletins = get_bulletins(state['board']) - send_message(f"Select a bulletin number to view from {state['board']}:", sender_id, interface) - for bulletin in bulletins: - send_message(f"[{bulletin[0]}]\nSubject: {bulletin[1]}", sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 3, 'board': state['board']}) - else: - send_message("Okay, feel free to send another command.", sender_id, interface) - update_user_state(sender_id, None) - - elif step == 6: if message.lower() == "end": board = state['board'] subject = state['subject'] @@ -228,48 +176,44 @@ def handle_bb_steps(sender_id, message, step, state, interface, bbs_nodes): sender_short_name = node_info['user'].get('shortName', f"Node {sender_id}") unique_id = add_bulletin(board, sender_short_name, subject, content, bbs_nodes, interface) send_message(f"Your bulletin '{subject}' has been posted to {board}.\n(╯°□°)╯📄📌[{board}]", sender_id, interface) - response = f"What would you like to do in the {board} board?\n[0]View Bulletins [1]Post Bulletin [2]Exit" - send_message(response, sender_id, interface) - update_user_state(sender_id, {'command': 'BULLETIN', 'step': 2, 'board': board}) + handle_bb_steps(sender_id, 'e', 1, state, interface, bbs_nodes) else: state['content'] += message + "\n" update_user_state(sender_id, state) + def handle_mail_steps(sender_id, message, step, state, interface, bbs_nodes): if step == 1: - choice = message - if choice == '0': + choice = message.lower() + if choice == 'r': sender_node_id = get_node_id_from_num(sender_id, interface) mail = get_mail(sender_node_id) if mail: send_message(f"You have {len(mail)} mail messages. Select a message number to read:", sender_id, interface) for msg in mail: - send_message(f"✉️ {msg[0]} ✉️\nDate: {msg[3]}\nFrom: {msg[1]}\nSubject: {msg[2]}", sender_id, interface) + send_message(f"-{msg[0]}-\nDate: {msg[3]}\nFrom: {msg[1]}\nSubject: {msg[2]}", sender_id, interface) update_user_state(sender_id, {'command': 'MAIL', 'step': 2}) else: - send_message("There are no messages in your mailbox.\n(`⌒`)", sender_id, interface) + send_message("There are no messages in your mailbox.📭", sender_id, interface) update_user_state(sender_id, None) - elif choice == '1': + elif choice == 's': send_message("What is the Short Name of the node you want to leave a message for?", sender_id, interface) update_user_state(sender_id, {'command': 'MAIL', 'step': 3}) - elif choice == '2': + elif choice == 'x': handle_help_command(sender_id, interface) elif step == 2: mail_id = int(message) try: - - # ERROR: sender_id is not what is stored in the DB 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) send_message(f"Date: {date}\nFrom: {sender}\nSubject: {subject}\n{content}", sender_id, interface) send_message("Would you like to delete this message now that you've viewed it? Y/N", sender_id, interface) update_user_state(sender_id, {'command': 'MAIL', 'step': 4, 'mail_id': mail_id, 'unique_id': unique_id}) except TypeError: - # get_main_content returned None. Node tried to access somebody's else mail message logging.info(f"Node {sender_id} tried to access non-existent message") - send_message(f"Mail not found", sender_id, interface) + send_message("Mail not found", sender_id, interface) update_user_state(sender_id, None) elif step == 3: @@ -296,7 +240,7 @@ def handle_mail_steps(sender_id, message, step, state, interface, bbs_nodes): 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.✉️\nJust don't let it get as messy as your regular email inbox (ಠ_ಠ)", sender_id, interface) + send_message("The message has been kept in your inbox.✉️", sender_id, interface) update_user_state(sender_id, None) elif step == 5: @@ -339,6 +283,7 @@ def handle_mail_steps(sender_id, message, step, state, interface, bbs_nodes): update_user_state(sender_id, None) + def handle_wall_of_shame_command(sender_id, interface): response = "Devices with battery levels below 20%:\n" for node_id, node in interface.nodes.items(): @@ -353,18 +298,18 @@ def handle_wall_of_shame_command(sender_id, interface): def handle_channel_directory_command(sender_id, interface): - response = "📚 CHANNEL DIRECTORY 📚\nWhat would you like to do in the Channel Directory?\n[0]View [1]Post [2]Exit" + response = "📚CHANNEL DIRECTORY📚\nWhat would you like to do?\n[V]iew [P]ost E[X]IT" send_message(response, sender_id, interface) update_user_state(sender_id, {'command': 'CHANNEL_DIRECTORY', 'step': 1}) def handle_channel_directory_steps(sender_id, message, step, state, interface): if step == 1: - choice = message - if choice == '2': + choice = message.lower() + if choice == 'x': handle_help_command(sender_id, interface) return - elif choice == '0': + elif choice == 'v': channels = get_channels() if channels: response = "Select a channel number to view:\n" + "\n".join( @@ -374,7 +319,7 @@ def handle_channel_directory_steps(sender_id, message, step, state, interface): else: send_message("No channels available in the directory.", sender_id, interface) handle_channel_directory_command(sender_id, interface) - elif choice == '1': + elif choice == 'p': send_message("Name your channel for the directory:", sender_id, interface) update_user_state(sender_id, {'command': 'CHANNEL_DIRECTORY', 'step': 3}) @@ -401,9 +346,9 @@ def handle_channel_directory_steps(sender_id, message, step, state, interface): def handle_send_mail_command(sender_id, message, interface, bbs_nodes): try: - parts = message.split("|", 3) + parts = message.split(",,", 3) if len(parts) != 4: - send_message("Send Mail Quick Command format:\nSM|{short_name}|{subject}|{message}", sender_id, interface) + send_message("Send Mail Quick Command format:\nSM,,{short_name},,{subject},,{message}", sender_id, interface) return _, short_name, subject, content = parts @@ -424,7 +369,7 @@ def handle_send_mail_command(sender_id, message, interface, bbs_nodes): 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." + 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) except Exception as e: @@ -442,7 +387,7 @@ def handle_check_mail_command(sender_id, interface): 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 += f"{i + 1:02d}. From: {msg[1]}, Subject: {msg[2]}\n" response += "\nPlease reply with the number of the message you want to read." send_message(response, sender_id, interface) @@ -497,9 +442,9 @@ def handle_delete_mail_confirmation(sender_id, message, state, interface, bbs_no def handle_post_bulletin_command(sender_id, message, interface, bbs_nodes): try: - parts = message.split("|", 3) + parts = message.split(",,", 3) if len(parts) != 4: - send_message("Post Bulletin Quick Command format:\nPB|{board_name}|{subject}|{content}", sender_id, interface) + send_message("Post Bulletin Quick Command format:\nPB,,{board_name},,{subject},,{content}", sender_id, interface) return _, board_name, subject, content = parts @@ -508,7 +453,6 @@ def handle_post_bulletin_command(sender_id, message, interface, bbs_nodes): 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) @@ -520,9 +464,9 @@ def handle_post_bulletin_command(sender_id, message, interface, bbs_nodes): def handle_check_bulletin_command(sender_id, message, interface): try: - parts = message.split("|", 2) + parts = message.split(",,", 2) if len(parts) != 2: - send_message("Check Bulletins Quick Command format:\nCB|{board_name}", sender_id, interface) + send_message("Check Bulletins Quick Command format:\nCB,,{board_name}", sender_id, interface) return _, board_name = parts @@ -570,7 +514,7 @@ 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) + send_message("Post Channel Quick Command format:\nCHP,,{channel_name},,{channel_url}", sender_id, interface) return _, channel_name, channel_url = parts @@ -590,7 +534,7 @@ def handle_check_channel_command(sender_id, interface): send_message("No channels available in the directory.", sender_id, interface) return - response = "📚 Available Channels:\n" + 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." @@ -632,7 +576,7 @@ def handle_list_channels_command(sender_id, interface): send_message("No channels available in the directory.", sender_id, interface) return - response = "📚 Available Channels:\n" + 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." @@ -667,7 +611,6 @@ def handle_read_channel_command(sender_id, message, state, 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)") + response = ("✈️QUICK COMMANDS✈️\nSend command below for usage info:\nSM,, - Send " + "Mail\nCM - Check Mail\nPB,, - Post Bulletin\nCB,, - Check Bulletins\n") send_message(response, sender_id, interface) \ No newline at end of file diff --git a/example_config.ini b/example_config.ini deleted file mode 100644 index b953fd1..0000000 --- a/example_config.ini +++ /dev/null @@ -1,34 +0,0 @@ -############################### -#### Select Interface type #### -############################### -# [type = serial] for USB connected devices -#If there are multiple serial devices connected, be sure to use the "port" option and specify a port -# Linux Example: -# port = /dev/ttyUSB0 -# -# Windows Example: -# port = COM3 -# [type = tcp] for network connected devices (ESP32 devices only - this does not work for WisBlock) -# If using tcp, remove the # from the beginning and replace 192.168.x.x with the IP address of your device -# Example: -# [interface] -# type = tcp -# hostname = 192.168.1.100 - -[interface] -type = serial -# port = /dev/ttyACM0 -# hostname = 192.168.x.x - - -############################ -#### BBS NODE SYNC LIST #### -############################ -# Provide a list of other nodes running TC²-BBS to sync mail messages and bulletins with -# Enter in a list of other BBS Nodes by their nodeID separated by commas (no spaces) -# Example: -# [sync] -# bbs_nodes = !17d7e4b7,!18e9f5a3,!1a2b3c4d - -# [sync] -# bbs_nodes = !17d7e4b7 diff --git a/message_processing.py b/message_processing.py index 766b266..03bc56f 100644 --- a/message_processing.py +++ b/message_processing.py @@ -3,25 +3,52 @@ import logging from meshtastic import BROADCAST_NUM from command_handlers import ( - handle_mail_command, handle_bulletin_command, handle_exit_command, - handle_help_command, handle_stats_command, handle_fortune_command, + handle_mail_command, handle_bulletin_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_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, add_channel from utils import get_user_state, get_node_short_name, get_node_id_from_num, send_message -command_handlers = { - "qch": handle_quick_help_command, - "st": handle_stats_command, - "fo": handle_fortune_command, - "ws": handle_wall_of_shame_command, - "exit": handle_exit_command, - "help": handle_help_command +main_menu_handlers = { + "q": handle_quick_help_command, + "b": lambda sender_id, interface: handle_help_command(sender_id, interface, 'bbs'), + "u": lambda sender_id, interface: handle_help_command(sender_id, interface, 'utilities'), + "x": handle_help_command +} + +bbs_menu_handlers = { + "m": handle_mail_command, + "b": handle_bulletin_command, + "c": handle_channel_directory_command, + "x": handle_help_command +} + + +utilities_menu_handlers = { + "s": handle_stats_command, + "f": handle_fortune_command, + "w": handle_wall_of_shame_command, + "x": handle_help_command +} + + +bulletin_menu_handlers = { + "g": lambda sender_id, interface: handle_bb_steps(sender_id, '0', 1, {'board': 'General'}, interface, None), + "i": lambda sender_id, interface: handle_bb_steps(sender_id, '1', 1, {'board': 'Info'}, interface, None), + "n": lambda sender_id, interface: handle_bb_steps(sender_id, '2', 1, {'board': 'News'}, interface, None), + "u": lambda sender_id, interface: handle_bb_steps(sender_id, '3', 1, {'board': 'Urgent'}, interface, None), + "x": handle_help_command +} + + +board_action_handlers = { + "r": lambda sender_id, interface, state: handle_bb_steps(sender_id, 'r', 2, state, interface, None), + "p": lambda sender_id, interface, state: handle_bb_steps(sender_id, 'p', 2, state, interface, None), + "x": handle_help_command } def process_message(sender_id, message, interface, is_sync_message=False): @@ -48,55 +75,85 @@ def process_message(sender_id, message, interface, is_sync_message=False): elif message.startswith("DELETE_MAIL|"): unique_id = message.split("|")[1] 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 + recipient_id = get_recipient_id_by_mail(unique_id) 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) - elif state: - command = state['command'] - step = state['step'] - - if command == 'MAIL': - handle_mail_steps(sender_id, message, step, state, interface, bbs_nodes) - elif command == 'BULLETIN': - handle_bb_steps(sender_id, message, step, state, interface, bbs_nodes) - elif command == 'STATS': - 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"): + if message_lower.startswith("sm,,"): + handle_send_mail_command(sender_id, message_lower, interface, bbs_nodes) + elif message_lower.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"): + elif message_lower.startswith("pb,,"): + handle_post_bulletin_command(sender_id, message_lower, interface, bbs_nodes) + elif message_lower.startswith("cb,,"): + handle_check_bulletin_command(sender_id, message_lower, interface) + elif message_lower.startswith("chp,,"): + handle_post_channel_command(sender_id, message_lower, interface) + elif message_lower.startswith("chl"): handle_list_channels_command(sender_id, interface) else: - handle_help_command(sender_id, interface) + if state and state['command'] == 'MENU': + menu_name = state['menu'] + if menu_name == 'bbs': + handlers = bbs_menu_handlers + elif menu_name == 'utilities': + handlers = utilities_menu_handlers + else: + handlers = main_menu_handlers + elif state and state['command'] == 'BULLETIN_MENU': + handlers = bulletin_menu_handlers + elif state and state['command'] == 'BULLETIN_ACTION': + handlers = board_action_handlers + else: + handlers = main_menu_handlers + + if message_lower == 'x': + # Reset to main menu state + handle_help_command(sender_id, interface) + return + + if message_lower in handlers: + if state and state['command'] in ['BULLETIN_ACTION', 'BULLETIN_READ', 'BULLETIN_POST', 'BULLETIN_POST_CONTENT']: + handlers[message_lower](sender_id, interface, state) + else: + handlers[message_lower](sender_id, interface) + elif state: + command = state['command'] + step = state['step'] + + if command == 'MAIL': + handle_mail_steps(sender_id, message, step, state, interface, bbs_nodes) + elif command == 'BULLETIN': + handle_bb_steps(sender_id, message, step, state, interface, bbs_nodes) + elif command == 'STATS': + handle_stats_steps(sender_id, message, step, interface) + 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 command == 'BULLETIN_POST': + handle_bb_steps(sender_id, message, 4, state, interface, bbs_nodes) + elif command == 'BULLETIN_POST_CONTENT': + handle_bb_steps(sender_id, message, 5, state, interface, bbs_nodes) + elif command == 'BULLETIN_READ': + handle_bb_steps(sender_id, message, 3, state, interface, bbs_nodes) + else: + handle_help_command(sender_id, interface) def on_receive(packet, interface): diff --git a/server.py b/server.py index af5117c..a31511a 100644 --- a/server.py +++ b/server.py @@ -2,8 +2,8 @@ """ TC²-BBS Server for Meshtastic by TheCommsChannel (TC²) -Date: 06/25/2024 -Version: 0.1.0 +Date: 07/09/2024 +Version: 0.1.4 Description: The system allows for mail message handling, bulletin boards, and a channel