@bobfrankston/rmfmail 1.1.244 → 1.1.246

package/client/app.bundle.js

@@ -8023,14 +8023,29 @@ async function deleteSelectedMessages() {
     if (!current) return;
     selected.push({ accountId: current.accountId, uid: current.message.uid, folderId: current.message.folderId });
   }
+  const inTrash = currentFolderSpecialUse === "trash";
+  const n = selected.length;
+  if (inTrash) {
+    if (!confirm(`Permanently delete ${n} message${n === 1 ? "" : "s"} from Trash?
+
+This cannot be undone.`)) {
+      return;
+    }
+  } else if (n > 1) {
+    if (!confirm(`Move ${n} messages to Trash?
+
+(Ctrl+Z restores them if this was a mistake.)`)) {
+      return;
+    }
+  }
   const statusSync = document.getElementById("status-sync");
   const snapshot = [...selected];
   removeMessagesAndReconcile(selected);
-  if (snapshot.length === 1) {
-    pushUndo({ kind: "delete", at: Date.now(), payload: { ...snapshot[0], subject: "" } });
-    if (statusSync) statusSync.textContent = `Trashed 1 message (syncing) \u2014 Ctrl+Z to undo`;
+  if (inTrash) {
+    if (statusSync) statusSync.textContent = `Permanently deleted ${n} message${n === 1 ? "" : "s"}`;
   } else {
-    if (statusSync) statusSync.textContent = `Trashed ${snapshot.length} messages (syncing)`;
+    pushUndo({ kind: "delete", at: Date.now(), payload: snapshot.map((m) => ({ ...m, subject: "" })) });
+    if (statusSync) statusSync.textContent = n === 1 ? `Trashed 1 message (syncing) \u2014 Ctrl+Z to undo` : `Trashed ${n} messages (syncing) \u2014 Ctrl+Z to undo`;
   }
   const byAccount = /* @__PURE__ */ new Map();
   for (const msg of snapshot) {
@@ -8052,9 +8067,11 @@ async function performUndo() {
   const statusSync = document.getElementById("status-sync");
   try {
     if (op.kind === "delete") {
-      const { accountId, uid, folderId } = op.payload;
-      await undeleteMessage(accountId, uid, folderId);
-      if (statusSync) statusSync.textContent = "Message restored";
+      const msgs = Array.isArray(op.payload) ? op.payload : [op.payload];
+      for (const m of msgs) {
+        await undeleteMessage(m.accountId, m.uid, m.folderId);
+      }
+      if (statusSync) statusSync.textContent = msgs.length === 1 ? "Message restored" : `Restored ${msgs.length} messages`;
     } else if (op.kind === "move") {
       const { messages: messages2 } = op.payload;
       const byDest = /* @__PURE__ */ new Map();