RNS-Things/MeshChatX
2
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(lxmf_utils): improve error handling in message conversion and ensure safe decoding of title and content

Browse Source
This commit is contained in:
ivan
2026-01-03 23:15:58 -06:00
parent a67e7da8af
commit 4c94c69586
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meshchatx/src/backend/lxmf_utils.py
View File

@@ -97,8 +97,12 @@ def convert_lxmf_message_to_dict(
"next_delivery_attempt", "next_delivery_attempt",
None, None,
), # attribute may not exist yet ), # attribute may not exist yet
"title": lxmf_message.title.decode("utf-8") if lxmf_message.title else "", "title": lxmf_message.title.decode("utf-8", errors="replace")
"content": lxmf_message.content.decode("utf-8") if lxmf_message.content else "", if lxmf_message.title
else "",
"content": lxmf_message.content.decode("utf-8", errors="replace")
if lxmf_message.content
else "",
"fields": fields, "fields": fields,
"timestamp": lxmf_message.timestamp, "timestamp": lxmf_message.timestamp,
"rssi": rssi, "rssi": rssi,
@@ -149,7 +153,14 @@ def convert_db_lxmf_message_to_dict(
db_lxmf_message, db_lxmf_message,
include_attachments: bool = False, include_attachments: bool = False,
): ):
fields = json.loads(db_lxmf_message["fields"]) try:
fields_str = db_lxmf_message.get("fields", "{}")
fields = json.loads(fields_str) if fields_str else {}
except (json.JSONDecodeError, TypeError):
fields = {}
if not isinstance(fields, dict):
fields = {}
# strip attachments if requested # strip attachments if requested
if not include_attachments: if not include_attachments: