mirror of
https://github.com/TheCommsChannel/TC2-BBS-mesh.git
synced 2024-11-14 16:44:16 -08:00
make send message and receive message use same lingo
This commit is contained in:
parent
f7b1d49515
commit
c6784290b5
|
@ -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
|
||||||
|
|
4
utils.py
4
utils.py
|
@ -20,11 +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=False, #should this be true?
|
||||||
wantResponse=False
|
wantResponse=False
|
||||||
)
|
)
|
||||||
destid = get_node_id_from_num(destination, interface)
|
destid = get_node_id_from_num(destination, interface)
|
||||||
logging.info(f"Sending message \"{chunk.replace("\n", "\\n")}\" to {destid} ({get_node_short_name(destid, interface)}). REPLY SEND ID={d.id}.")
|
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}")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue