Undelete emails 💎 (closes #589)

crates/cli/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Stalwart Labs Ltd. <[email protected]>"]
 license = "AGPL-3.0-only OR LicenseRef-SEL"
 repository = "https://github.com/stalwartlabs/cli"
 homepage = "https://github.com/stalwartlabs/cli"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 readme = "README.md"
 resolver = "2"

crates/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "common"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 resolver = "2"
 

crates/common/src/config/mod.rs

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
  */
 
-use std::sync::Arc;
+use std::{sync::Arc, time::Duration};
 
 use arc_swap::ArcSwap;
 use directory::{Directories, Directory};
@@ -149,7 +149,15 @@ impl Core {
                         }
                         None
                     }
-                    _ => Some(Enterprise { license }),
+                    _ => Some(Enterprise {
+                        license,
+                        undelete_period: config
+                            .property_or_default::<Option<Duration>>(
+                                "enterprise.undelete-period",
+                                "false",
+                            )
+                            .unwrap_or_default(),
+                    }),
                 }
             }
             Some(Err(e)) => {

crates/common/src/lib.rs

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
  */
 
-use std::{borrow::Cow, net::IpAddr, sync::Arc};
+use std::{borrow::Cow, net::IpAddr, sync::Arc, time::Duration};
 
 use arc_swap::ArcSwap;
 use config::{
@@ -88,6 +88,7 @@ pub struct Network {
 #[derive(Clone)]
 pub struct Enterprise {
     pub license: LicenseKey,
+    pub undelete_period: Option<Duration>,
 }
 
 // SPDX-SnippetEnd

crates/directory/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "directory"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 resolver = "2"
 

crates/imap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "imap"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 resolver = "2"
 

crates/jmap-proto/src/types/collection.rs

@@ -4,7 +4,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
  */
 
-use std::fmt::{self, Display, Formatter};
+use std::{
+    fmt::{self, Display, Formatter},
+    str::FromStr,
+};
 
 use utils::map::bitmap::BitmapItem;
 
@@ -101,6 +104,24 @@ impl Display for Collection {
     }
 }
 
+impl FromStr for Collection {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "pushSubscription" => Ok(Collection::PushSubscription),
+            "email" => Ok(Collection::Email),
+            "mailbox" => Ok(Collection::Mailbox),
+            "thread" => Ok(Collection::Thread),
+            "identity" => Ok(Collection::Identity),
+            "emailSubmission" => Ok(Collection::EmailSubmission),
+            "sieveScript" => Ok(Collection::SieveScript),
+            "principal" => Ok(Collection::Principal),
+            _ => Err(()),
+        }
+    }
+}
+
 impl BitmapItem for Collection {
     fn max() -> u64 {
         Collection::None as u64

crates/jmap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jmap"
-version = "0.8.4"
+version = "0.8.5"
 edition = "2021"
 resolver = "2"
 
@@ -11,6 +11,7 @@ jmap_proto = { path = "../jmap-proto" }
 smtp = { path =  "../smtp" }
 utils = { path =  "../utils" }
 common = { path =  "../common" }
+se_common = { path =  "../se-common" }
 directory = { path =  "../directory" }
 smtp-proto = { version = "0.1" }
 mail-parser = { version = "0.9", features = ["full_encoding", "serde_support", "ludicrous_mode"] }