From df5f648b26fc80f90420ffabe55ef5952a8554db Mon Sep 17 00:00:00 2001 From: Nestpebble Date: Fri, 27 Sep 2024 03:30:21 +0100 Subject: [PATCH] try and round off adding an interpreter to the bbs DM --- mesh_bot.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mesh_bot.py b/mesh_bot.py index bc8ccbb..932eaad 100755 --- a/mesh_bot.py +++ b/mesh_bot.py @@ -479,12 +479,13 @@ def handle_bbspost(message, message_from_id, deviceID): elif "@" in message and not "example:" in message: toNode = message.split("@")[1].split("#")[0] toNode = toNode.rstrip() - if "!" in toNode: + # if toNode preceded by !, or is 8 characters long try to interpret as hex + if "!" in toNode or len(toNode) == 8: try: - int(toNode.strip("!"),16) toNode = int(toNode.strip("!"),16) except ValueError as e: logger.debug("toNode is not hex, error: {e}") + # if toNode is all alpha or not totally numeric, see if it is a shortname elif toNode.isalpha() or not toNode.isnumeric(): toNode = get_num_from_short_name(toNode, deviceID) if toNode == 0: