dandri/MeshChatX
1
0
Fork 0
mirror of https://git.quad4.io/RNS-Things/MeshChatX.git synced 2026-05-25 12:04:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve message handling by stripping UTF-16 surrogates from search terms and cleaning up input strings in ReticulumMeshChat.

Browse Source
This commit is contained in:
Ivan
2026-03-22 15:08:26 +03:00
parent 418e130fc9
commit 0564eb8f10
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meshchatx/meshchat.py
+1 -1
View File
@@ -1475,7 +1475,7 @@ class ReticulumMeshChat:
)
if not cleaned:
continue
cleaned = "".join(ch for ch in cleaned if ch.isprintable())
cleaned = "".join(ch for ch in cleaned if ch.isprintable()).strip()
if not cleaned:
continue
if len(cleaned) > max_pattern_length:
meshchatx/src/backend/message_handler.py
+18 -9
View File
@@ -1,6 +1,12 @@
from .database import Database
def _strip_utf16_surrogates(text):
if text is None:
return None
return "".join(c for c in str(text) if not (0xD800 <= ord(c) <= 0xDFFF))
class MessageHandler:
def __init__(self, db: Database):
self.db = db
@@ -42,6 +48,7 @@ class MessageHandler:
)
def search_messages(self, local_hash, search_term, limit=500):
search_term = _strip_utf16_surrogates(search_term) or ""
like_term = f"%{search_term}%"
query = """
SELECT peer_hash, MAX(timestamp) as max_ts
@@ -126,15 +133,17 @@ class MessageHandler:
)
if search:
like_term = f"%{search}%"
# Search in latest message info OR search across ALL messages for this peer
where_clauses.append("""
(m1.title LIKE ? OR m1.content LIKE ? OR m1.peer_hash LIKE ? OR c.display_name LIKE ?
OR m1.peer_hash IN (SELECT peer_hash FROM lxmf_messages WHERE title LIKE ? OR content LIKE ?))
""")
params.extend(
[like_term, like_term, like_term, like_term, like_term, like_term],
)
search = _strip_utf16_surrogates(search) or ""
if search:
like_term = f"%{search}%"
# Search in latest message info OR search across ALL messages for this peer
where_clauses.append("""
(m1.title LIKE ? OR m1.content LIKE ? OR m1.peer_hash LIKE ? OR c.display_name LIKE ?
OR m1.peer_hash IN (SELECT peer_hash FROM lxmf_messages WHERE title LIKE ? OR content LIKE ?))
""")
params.extend(
[like_term, like_term, like_term, like_term, like_term, like_term],
)
if where_clauses:
query += " WHERE " + " AND ".join(where_clauses)