mirror of
https://github.com/meshcore-dev/meshcore-cli.git
synced 2026-04-20 22:13:48 +00:00
display channel_echoes even if message is not decrypted if channel is configured (should not happen as there is no option not to decrypt messages ...)
This commit is contained in:
parent
86bcc900a9
commit
52cdaa2146
1 changed files with 11 additions and 6 deletions
|
|
@ -35,7 +35,7 @@ import re
|
||||||
from meshcore import MeshCore, EventType, logger
|
from meshcore import MeshCore, EventType, logger
|
||||||
|
|
||||||
# Version
|
# Version
|
||||||
VERSION = "v1.5.1"
|
VERSION = "v1.5.2"
|
||||||
|
|
||||||
# default ble address is stored in a config file
|
# default ble address is stored in a config file
|
||||||
MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
|
MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
|
||||||
|
|
@ -237,13 +237,18 @@ async def handle_log_rx(event):
|
||||||
if payload_type == 0x05: # flood msg / channel
|
if payload_type == 0x05: # flood msg / channel
|
||||||
if handle_log_rx.channel_echoes:
|
if handle_log_rx.channel_echoes:
|
||||||
|
|
||||||
chan_name = ""
|
if "chan_name" in event.payload:
|
||||||
if "message" in event.payload :
|
|
||||||
chan_name = event.payload["chan_name"]
|
chan_name = event.payload["chan_name"]
|
||||||
|
else:
|
||||||
|
chan_name = ""
|
||||||
|
|
||||||
|
if "message" in event.payload :
|
||||||
message = event.payload["message"]
|
message = event.payload["message"]
|
||||||
elif handle_log_rx.echo_unk_chans:
|
elif handle_log_rx.echo_unk_chans or chan_name != "":
|
||||||
chan_name = event.payload["chan_hash"]
|
if chan_name == "":
|
||||||
message = event.payload["crypted"]
|
chan_name = event.payload["chan_hash"]
|
||||||
|
if "crypted" in event.payload:
|
||||||
|
message = event.payload["crypted"]
|
||||||
|
|
||||||
if chan_name != "" :
|
if chan_name != "" :
|
||||||
width = os.get_terminal_size().columns
|
width = os.get_terminal_size().columns
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue