@bobfrankston/rmfmail 1.2.197 → 1.2.198

package/client/android-bootstrap.bundle.js

@@ -9503,24 +9503,16 @@ var CompatImapClient = class {
     await this.native.closeMailbox();
     return msgs.map((m) => new FetchedMessage(m));
   }
-  /** Search messages in a mailbox */
+  /** Search messages in a mailbox.
+   *  Criteria: from/to/cc/subject/body/text (string or string[], each key
+   *  repeats and ANDs), since/before (Date), seen/unseen/flagged/answered/
+   *  draft (boolean flags), `not` (criteria object or array — each becomes
+   *  a NOT'd key group), `or` (array of ≥2 criteria objects — compiled to
+   *  IMAP's binary prefix OR chain). */
   async searchMessages(mailbox, criteria) {
     await this.ensureConnected();
     await this.native.select(mailbox);
-    const parts = [];
-    if (criteria.from)
-      parts.push(`FROM "${criteria.from}"`);
-    if (criteria.to)
-      parts.push(`TO "${criteria.to}"`);
-    if (criteria.subject)
-      parts.push(`SUBJECT "${criteria.subject}"`);
-    if (criteria.body)
-      parts.push(`BODY "${criteria.body}"`);
-    if (criteria.since)
-      parts.push(`SINCE ${formatDate(criteria.since)}`);
-    if (criteria.before)
-      parts.push(`BEFORE ${formatDate(criteria.before)}`);
-    const searchStr = parts.length > 0 ? parts.join(" ") : "ALL";
+    const searchStr = buildSearchString(criteria || {});
     const uids = await this.native.search(searchStr);
     await this.native.closeMailbox();
     return uids;
@@ -9680,6 +9672,71 @@ var CompatImapClient = class {
     return msg?.flags ? [...msg.flags] : [];
   }
 };
+function imapQuote(v) {
+  return `"${String(v).replace(/([\\"])/g, "\\$1")}"`;
+}
+function searchKeys(c) {
+  const parts = [];
+  const each = (v, fn) => {
+    for (const x of Array.isArray(v) ? v : [v])
+      if (x)
+        fn(String(x));
+  };
+  if (c.from)
+    each(c.from, (v) => parts.push(`FROM ${imapQuote(v)}`));
+  if (c.to)
+    each(c.to, (v) => parts.push(`TO ${imapQuote(v)}`));
+  if (c.cc)
+    each(c.cc, (v) => parts.push(`CC ${imapQuote(v)}`));
+  if (c.subject)
+    each(c.subject, (v) => parts.push(`SUBJECT ${imapQuote(v)}`));
+  if (c.body)
+    each(c.body, (v) => parts.push(`BODY ${imapQuote(v)}`));
+  if (c.text)
+    each(c.text, (v) => parts.push(`TEXT ${imapQuote(v)}`));
+  if (c.since)
+    parts.push(`SINCE ${formatDate(c.since)}`);
+  if (c.before)
+    parts.push(`BEFORE ${formatDate(c.before)}`);
+  if (c.seen)
+    parts.push("SEEN");
+  if (c.unseen)
+    parts.push("UNSEEN");
+  if (c.flagged)
+    parts.push("FLAGGED");
+  if (c.unflagged)
+    parts.push("UNFLAGGED");
+  if (c.answered)
+    parts.push("ANSWERED");
+  if (c.draft)
+    parts.push("DRAFT");
+  return parts;
+}
+function keyGroup(c) {
+  const keys = searchKeys(c);
+  if (keys.length === 0)
+    return null;
+  return keys.length === 1 ? keys[0] : `(${keys.join(" ")})`;
+}
+function buildSearchString(criteria) {
+  const parts = searchKeys(criteria);
+  const nots = criteria.not ? Array.isArray(criteria.not) ? criteria.not : [criteria.not] : [];
+  for (const n of nots) {
+    const g = keyGroup(n);
+    if (g)
+      parts.push(`NOT ${g}`);
+  }
+  const ors = (Array.isArray(criteria.or) ? criteria.or : []).map(keyGroup).filter(Boolean);
+  if (ors.length === 1)
+    parts.push(ors[0]);
+  else if (ors.length > 1) {
+    let expr = ors[ors.length - 1];
+    for (let i = ors.length - 2; i >= 0; i--)
+      expr = `OR ${ors[i]} ${expr}`;
+    parts.push(expr);
+  }
+  return parts.length > 0 ? parts.join(" ") : "ALL";
+}
 function formatDate(d) {
   const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
   return `${d.getDate()}-${months[d.getMonth()]}-${d.getFullYear()}`;