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 pull request #8 from Blergo/Yorkshire-BBS

Browse source 
Small fixes and sync
This commit is contained in:
Blergo 2024-07-02 20:04:50 +01:00 committed by GitHub
parent 9b599c8846 73f2cb24ba
commit d419cc91f3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
command_handlers.py
View file

@ -1,7 +1,7 @@
import logging
import random
import time
import psutil
import psutil # type: ignore
from db_operations import (
add_bulletin, add_mail, delete_mail,
@ -103,6 +103,7 @@ def handle_stats_steps(sender_id, message, step, interface, bbs_nodes):
update_user_state(sender_id, {'command': 'STATS', 'step': 2})
if choice == 1:
psutil.cpu_percent()
psutil.cpu_count()
time.sleep(0.1)
cpu = str(psutil.cpu_percent()/psutil.cpu_count())
ramu = str(psutil.virtual_memory().percent)

5
db_operations.py
View file

@ -4,6 +4,8 @@ import threading
import uuid
from datetime import datetime
from meshtastic import BROADCAST_NUM
from utils import (
send_bulletin_to_bbs_nodes,
send_delete_bulletin_to_bbs_nodes,
@ -78,9 +80,8 @@ def add_bulletin(board, sender_short_name, subject, content, bbs_nodes, interfac
# New logic to send group chat notification for urgent bulletins
if board.lower() == "urgent":
group_chat_id = 4294967295 # Default group chat ID (0xFFFFFFFF)
notification_message = f"💥NEW URGENT BULLETIN💥\nFrom: {sender_short_name}\nTitle: {subject}"
send_message(notification_message, group_chat_id, interface)
send_message(notification_message, BROADCAST_NUM, interface)
return unique_id

5
message_processing.py
View file

@ -1,5 +1,7 @@
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,
@ -33,9 +35,8 @@ def process_message(sender_id, message, interface, is_sync_message=False):
add_bulletin(board, sender_short_name, subject, content, [], interface, unique_id=unique_id)
if board.lower() == "urgent":
group_chat_id = 4294967295
notification_message = f"💥NEW URGENT BULLETIN💥\nFrom: {sender_short_name}\nTitle: {subject}"
send_message(notification_message, group_chat_id, interface)
send_message(notification_message, BROADCAST_NUM, interface)
elif message.startswith("MAIL|"):
parts = message.split("|")
sender_id, sender_short_name, recipient_id, subject, content, unique_id = parts[1], parts[2], parts[3], parts[4], parts[5], parts[6]