dandri/MeshChatX
1
0
Fork 0
mirror of https://git.quad4.io/RNS-Things/MeshChatX.git synced 2026-08-28 11:54:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nomadnet): convert file download backtick params to var_ dict, fix cancel crash

Browse Source
This commit is contained in:
Ivan
2026-05-10 01:53:45 -05:00
parent 4baf577b4e
commit 41e40dc3aa
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meshchatx/meshchat.py
+7 -1
View File
@@ -14080,6 +14080,10 @@ class ReticulumMeshChat:
destination_hash_hex = download_data.get("destination_hash")
file_path = download_data.get("file_path")
request_data = download_data.get("data")
if isinstance(request_data, str):
request_data = convert_nomadnet_string_data_to_map(request_data)
elif request_data is None:
request_data = {}
if not destination_hash_hex or not file_path:
return
@@ -15506,7 +15510,9 @@ class ReticulumMeshChat:
except Exception as e:
print(f"_lxmf_reticulum_enforce_block: failed: {e}")
def _delete_contact_and_stamp_ticket(self, destination_hash: str, context=None) -> None:
def _delete_contact_and_stamp_ticket(
self, destination_hash: str, context=None
) -> None:
"""Remove contact and stamp/ticket state for a blocked destination."""
ctx = context or self.current_context
if not ctx or not ctx.database:
meshchatx/src/backend/nomadnet_downloader.py
+16 -1
View File
@@ -107,7 +107,22 @@ class NomadnetDownloader:
if self.request_receipt is not None:
try:
self.request_receipt.cancel()
if (
hasattr(self.request_receipt, "resource")
and self.request_receipt.resource is not None
):
self.request_receipt.resource.cancel()
else:
self.request_receipt.status = RNS.RequestReceipt.FAILED
if (
hasattr(self.request_receipt, "link")
and self.request_receipt.link is not None
and self.request_receipt
in self.request_receipt.link.pending_requests
):
self.request_receipt.link.pending_requests.remove(
self.request_receipt
)
except Exception as e:
print(f"Failed to cancel request: {e}")