Split LINE and not COMMAND

[rbdr/olden-mail] / src / middleware / find_mailboxes_compatibility.rs

diff --git a/src/middleware/find_mailboxes_compatibility.rs b/src/middleware/find_mailboxes_compatibility.rs
index a1ddda20358d23c444e8db6513fb376058fb9937..51d7488b84b45c490a975c3227e20e2fc5449e66 100644 (file)
--- a/src/middleware/find_mailboxes_compatibility.rs
+++ b/src/middleware/find_mailboxes_compatibility.rs
@@ -1,9 +1,7 @@
-use log::debug;
-
 use super::Middleware;
 
-/// `MailDrop` can't find folders to sync because it implements IMAPv3 and
-/// sends FIND MAILBOXES /*, which does not exist in IMAPv4.
+/// `MailDrop` can't find folders to sync because it implements `IMAPv3` and
+/// sends FIND MAILBOXES /*, which does not exist in `IMAPv4`.
 /// which is not understood by modern servers. It instead replaces it with
 /// a LIST command.
 pub struct FindMailboxesCompatibility {
@@ -22,9 +20,8 @@ impl Middleware for FindMailboxesCompatibility {
         if command.contains("FIND MAILBOXES /*") {
             if let Some(tag) = command.split("FIND MAILBOXES /*").next() {
                 // We'll need to convert the LIST to a FIND
-                self.tags.push(tag.to_string());
+                self.tags.push(tag.trim().to_string());
                 let replacement = format!("{} LIST \"\" \"*\"\r\n", tag.trim());
-                debug!("### {replacement}");
                 return replacement.into_bytes();
             }
         }
@@ -36,7 +33,7 @@ impl Middleware for FindMailboxesCompatibility {
         let contains_ok_completed = self
             .tags
             .iter()
-            .any(|tag| command.contains(&format!("{} OK Completed", tag)));
+            .any(|tag| command.contains(&format!("{tag} OK Completed")));
 
         // We want to only modify responses that were a result of a MAILBOX call.
         if !contains_ok_completed {
@@ -53,16 +50,22 @@ impl Middleware for FindMailboxesCompatibility {
 
                 // Transform IMAPv4 "* LIST" lines to IMAPv3 "* MAILBOX"
                 if line.starts_with("* LIST") {
-                    if let Some(last_slash_pos) = line.rfind('/') {
-                        let mailbox_name = line[(last_slash_pos + 1)..].trim();
-                        return Some(format!("* MAILBOX {}\r", mailbox_name));
+                    if let Some(last_slash_pos) = line.rfind("\"/\"") {
+                        let mailbox_name = line[(last_slash_pos + 3)..].replace('"', "");
+                        return Some(format!("* MAILBOX {}\r", mailbox_name.trim()));
+                    }
+                }
+
+                if line.contains("OK") {
+                    if let Some(tag) = line.split("OK").next() {
+                        return Some(format!("{} OK MAILBOX Completed.\r", tag.trim()).to_string());
                     }
                 }
 
-                return Some(line.to_string());
+                Some(line.to_string())
             })
             .collect();
 
-        return lines.join("\n").into_bytes();
+        lines.join("\n").into_bytes()
     }
 }