aboutsummaryrefslogtreecommitdiffstats
path: root/packages/meshbay-node/src/meshbay_node/ops
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meshbay-node/src/meshbay_node/ops')
-rw-r--r--packages/meshbay-node/src/meshbay_node/ops/chat.py1
-rw-r--r--packages/meshbay-node/src/meshbay_node/ops/files.py7
2 files changed, 5 insertions, 3 deletions
diff --git a/packages/meshbay-node/src/meshbay_node/ops/chat.py b/packages/meshbay-node/src/meshbay_node/ops/chat.py
index 9fc7b94..7caf85c 100644
--- a/packages/meshbay-node/src/meshbay_node/ops/chat.py
+++ b/packages/meshbay-node/src/meshbay_node/ops/chat.py
@@ -214,7 +214,6 @@ async def encrypt_chat_history(state: dict, group_id: str) -> dict:
if isinstance(row.payload, bytes) else str(row.payload))
env = seal(key, group_id, epoch, device_b64, device_raw, sk_node, {
"text": text,
- "thread_id": row.thread_id,
"sender_name": row.sender_name,
"sent_at": int(row.timestamp),
# The node sealed this after the fact; it did not witness it being
diff --git a/packages/meshbay-node/src/meshbay_node/ops/files.py b/packages/meshbay-node/src/meshbay_node/ops/files.py
index 4609627..a448103 100644
--- a/packages/meshbay-node/src/meshbay_node/ops/files.py
+++ b/packages/meshbay-node/src/meshbay_node/ops/files.py
@@ -4,8 +4,11 @@ from __future__ import annotations
import asyncio
import logging
+import os
from pathlib import Path
+from meshbay_common.paths import long_path
+
from meshbay_node.ops.core import OpError, _group_ctx
log = logging.getLogger("meshbay_node.ops")
@@ -41,7 +44,7 @@ async def delete_file(state: dict, group_id: str, file_id: str) -> dict:
f"not readable right now — the file is frozen, not gone", status=409)
try:
- path.unlink()
+ os.unlink(long_path(path))
except FileNotFoundError:
# Already gone from disk; drop the stale entry rather than refusing.
log.warning("Index named a file that is not on disk: %s", path)
@@ -104,7 +107,7 @@ async def prune_index_cache(state: dict) -> dict:
return True
if any(not r.available for r in owning):
return False
- return not path.exists()
+ return not os.path.exists(long_path(path))
paths = await cache.all_paths()
stale = await asyncio.to_thread(lambda: [p for p in paths if _is_stale(p)])