DRCIT/N2DRC-BBS-mesh
1
0
Fork 0
forked from mudhorn/TC2-BBS-mesh
Code Pull requests Activity

fixed bug where cb,,board_name would always return no messages

Browse source
This commit is contained in:
nagumii 2024-09-25 00:15:38 +03:00
parent 880f93d3ad
commit 592f8bd073
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
command_handlers.py
View file

@ -80,7 +80,7 @@ def handle_mail_command(sender_id, interface):
def handle_bulletin_command(sender_id, interface): def handle_bulletin_command(sender_id, interface):
response = "📰Bulletin Menu📰\nWhich board would you like to enter?\n[G]eneral [I]nfo [N]ews [U]rgent" response = f"📰Bulletin Menu📰\nWhich board would you like to enter?\n[G]eneral [I]nfo [N]ews [U]rgent"
send_message(response, sender_id, interface) send_message(response, sender_id, interface)
update_user_state(sender_id, {'command': 'BULLETIN_MENU', 'step': 1}) update_user_state(sender_id, {'command': 'BULLETIN_MENU', 'step': 1})
@ -166,7 +166,8 @@ def handle_bb_steps(sender_id, message, step, state, interface, bbs_nodes):
handle_help_command(sender_id, interface, 'bbs') handle_help_command(sender_id, interface, 'bbs')
return return
board_name = boards[int(message)] board_name = boards[int(message)]
response = f"What would you like to do in the {board_name} board?\n[R]ead [P]ost" bulletins = get_bulletins(board_name)
response = f"{board_name} has {len(bulletins)} messages.\n[R]ead [P]ost"
send_message(response, sender_id, interface) send_message(response, sender_id, interface)
update_user_state(sender_id, {'command': 'BULLETIN_ACTION', 'step': 2, 'board': board_name}) update_user_state(sender_id, {'command': 'BULLETIN_ACTION', 'step': 2, 'board': board_name})
@ -186,7 +187,7 @@ def handle_bb_steps(sender_id, message, step, state, interface, bbs_nodes):
if board_name.lower() == 'urgent': if board_name.lower() == 'urgent':
node_id = get_node_id_from_num(sender_id, interface) node_id = get_node_id_from_num(sender_id, interface)
allowed_nodes = interface.allowed_nodes allowed_nodes = interface.allowed_nodes
print(f"Checking permissions for node_id: {node_id} with allowed_nodes: {allowed_nodes}") # Debug statement logging.info(f"Checking permissions for node_id: {node_id} with allowed_nodes: {allowed_nodes}") # Debug statement
if allowed_nodes and node_id not in allowed_nodes: if allowed_nodes and node_id not in allowed_nodes:
send_message("You don't have permission to post to this board.", sender_id, interface) send_message("You don't have permission to post to this board.", sender_id, interface)
handle_bb_steps(sender_id, 'e', 1, state, interface, bbs_nodes) handle_bb_steps(sender_id, 'e', 1, state, interface, bbs_nodes)
@ -535,10 +536,13 @@ def handle_check_bulletin_command(sender_id, message, interface):
# Split the message only once # Split the message only once
parts = message.split(",,", 1) parts = message.split(",,", 1)
if len(parts) != 2 or not parts[1].strip(): if len(parts) != 2 or not parts[1].strip():
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 return
board_name = parts[1].strip() boards = {0: "General", 1: "Info", 2: "News", 3: "Urgent"} #list of boards
board_name = parts[1].strip().capitalize() #get board name from quick command and capitalize it
board_name = boards[next(key for key, value in boards.items() if value == board_name)] #search for board name in list
bulletins = get_bulletins(board_name) bulletins = get_bulletins(board_name)
if not bulletins: if not bulletins:
send_message(f"No bulletins available on {board_name} board.", sender_id, interface) send_message(f"No bulletins available on {board_name} board.", sender_id, interface)