@lacrous/omnicloud 0.2.22 → 0.2.24

package/dist/index.cjs

@@ -2177,11 +2177,11 @@ var FolderService = class {
     const fileIds = await this.collectFileIds(userId, subtree);
     const batchId = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 10)}`;
     const stampedAt = /* @__PURE__ */ new Date();
-    await this.folders.updateMany(
+    await this.folders.trashSubtree(
       subtree.map((folder) => folder.id),
+      fileIds,
       { deletedAt: stampedAt, trashBatchId: batchId }
     );
-    await this.files.updateMany(fileIds, { deletedAt: stampedAt, trashBatchId: batchId });
     await this.activity.record({
       userId,
       action: "trash",
@@ -2216,14 +2216,11 @@ var FolderService = class {
     );
     const restorableFileIds = restorableFiles.map((file) => file.id);
     if (restorableFolders.length > 0) {
-      await this.folders.updateMany(
+      await this.folders.restoreSubtree(
         restorableFolders.map((folder) => folder.id),
-        { deletedAt: null, trashBatchId: null }
+        restorableFileIds,
+        { rootId: id, reparent: { parentId } }
       );
-      await this.folders.update(id, { parentId });
-    }
-    if (restorableFileIds.length > 0) {
-      await this.files.updateMany(restorableFileIds, { deletedAt: null, trashBatchId: null });
     }
     await this.activity.record({
       userId,
@@ -2250,9 +2247,16 @@ var FolderService = class {
     );
     const engine = await this.engineFor(userId);
     const removedFileIds = [];
+    const versionsByFile = await this.files.listVersionsForFiles(affected.map((file) => file.id));
     for (const file of affected) {
       try {
-        await engine.remove({ messageId: String(file.telegramMessageId) });
+        const messageIds = /* @__PURE__ */ new Set([String(file.telegramMessageId)]);
+        for (const version of versionsByFile.get(file.id) ?? []) {
+          messageIds.add(String(version.telegramMessageId));
+        }
+        for (const messageId of messageIds) {
+          await engine.remove({ messageId });
+        }
         removedFileIds.push(file.id);
       } catch {
       }
@@ -2727,6 +2731,13 @@ function mapTelegramError(error, fallbackMessage) {
       case "CHANNEL_INVALID":
       case "CHAT_ID_INVALID":
         return new StorageNotInitializedError();
+      // Permanent: the account cannot write to the channel. Retrying cannot help.
+      case "CHAT_WRITE_FORBIDDEN":
+      case "CHAT_ADMIN_REQUIRED":
+        return new ForbiddenError("OmniCloud cannot write to the storage channel for this account");
+      // Permanent: the stored channel reference is stale. Retrying with the same reference fails too.
+      case "PEER_ID_INVALID":
+        return new StorageNotInitializedError();
       case "MSG_ID_INVALID":
       case "MESSAGE_ID_INVALID":
         return new TelegramFileNotFoundError();