@bobfrankston/rmfmail 1.1.71 → 1.1.73

package/client/android-bootstrap.bundle.js

@@ -6901,10 +6901,12 @@ Accept: application/json\r
    *  as a destination folder — `POST /messages/{id}/trash` is the native
    *  path (equivalent to setting TRASH and removing INBOX in one op).
    *  Used by mailx's delete/trash path. */
-  async trashMessage(folder, uid) {
-    const query = `in:${this.folderToLabel(folder)}`;
-    const ids = await this.listMessageIds(query, 1e3);
-    const id = ids.find((id2) => idToUid(id2) === uid);
+  async trashMessage(folder, uid, gmailId) {
+    let id = gmailId;
+    if (!id) {
+      const ids = await this.listMessageIds(`in:${this.folderToLabel(folder)}`, 1e3);
+      id = ids.find((x) => idToUid(x) === uid);
+    }
     if (!id)
       throw new Error(`Gmail trashMessage: UID ${uid} not found in ${folder}`);
     await this.fetch(`/messages/${id}/trash`, { method: "POST" });
@@ -6912,10 +6914,12 @@ Accept: application/json\r
   /** Move between "folders" == swap one label for another via modifyLabels.
    *  System labels (INBOX/SENT/TRASH/SPAM) are translated from the folder
    *  path; user labels use the folder path verbatim as the label id. */
-  async moveMessage(fromFolder, uid, toFolder) {
-    const query = `in:${this.folderToLabel(fromFolder)}`;
-    const ids = await this.listMessageIds(query, 1e3);
-    const id = ids.find((id2) => idToUid(id2) === uid);
+  async moveMessage(fromFolder, uid, toFolder, gmailId) {
+    let id = gmailId;
+    if (!id) {
+      const ids = await this.listMessageIds(`in:${this.folderToLabel(fromFolder)}`, 1e3);
+      id = ids.find((x) => idToUid(x) === uid);
+    }
     if (!id)
       throw new Error(`Gmail moveMessage: UID ${uid} not found in ${fromFolder}`);
     const toLabel = this.folderPathToLabelId(toFolder);