diff --git a/src/imap.rs b/src/imap.rs index 6cb361068..3ff463bda 100644 --- a/src/imap.rs +++ b/src/imap.rs @@ -146,7 +146,6 @@ pub enum FolderMeaning { Mvbox, Sent, Trash, - Drafts, /// Virtual folders. /// @@ -166,7 +165,6 @@ impl FolderMeaning { FolderMeaning::Mvbox => Some(Config::ConfiguredMvboxFolder), FolderMeaning::Sent => Some(Config::ConfiguredSentboxFolder), FolderMeaning::Trash => Some(Config::ConfiguredTrashFolder), - FolderMeaning::Drafts => None, FolderMeaning::Virtual => None, } } @@ -816,7 +814,7 @@ impl Session { let folder_meaning = get_folder_meaning(&folder); if !matches!( folder_meaning, - FolderMeaning::Virtual | FolderMeaning::Unknown | FolderMeaning::Drafts + FolderMeaning::Virtual | FolderMeaning::Unknown ) { self.resync_folder_uids(context, folder.name(), folder_meaning) .await?; @@ -2123,27 +2121,6 @@ fn get_folder_meaning_by_name(folder_name: &str) -> FolderMeaning { "迷惑メール", "스팸", ]; - const DRAFT_NAMES: &[&str] = &[ - "Drafts", - "Kladder", - "Entw?rfe", - "Borradores", - "Brouillons", - "Bozze", - "Concepten", - "Wersje robocze", - "Rascunhos", - "Entwürfe", - "Koncepty", - "Kopie robocze", - "Taslaklar", - "Utkast", - "Πρόχειρα", - "Черновики", - "下書き", - "草稿", - "임시보관함", - ]; const TRASH_NAMES: &[&str] = &[ "Trash", "Bin", @@ -2170,8 +2147,6 @@ fn get_folder_meaning_by_name(folder_name: &str) -> FolderMeaning { FolderMeaning::Sent } else if SPAM_NAMES.iter().any(|s| s.to_lowercase() == lower) { FolderMeaning::Spam - } else if DRAFT_NAMES.iter().any(|s| s.to_lowercase() == lower) { - FolderMeaning::Drafts } else if TRASH_NAMES.iter().any(|s| s.to_lowercase() == lower) { FolderMeaning::Trash } else { @@ -2185,7 +2160,6 @@ fn get_folder_meaning_by_attrs(folder_attrs: &[NameAttribute]) -> FolderMeaning NameAttribute::Trash => return FolderMeaning::Trash, NameAttribute::Sent => return FolderMeaning::Sent, NameAttribute::Junk => return FolderMeaning::Spam, - NameAttribute::Drafts => return FolderMeaning::Drafts, NameAttribute::All | NameAttribute::Flagged => return FolderMeaning::Virtual, NameAttribute::Extension(label) => { match label.as_ref() { diff --git a/src/imap/scan_folders.rs b/src/imap/scan_folders.rs index 5793c6f51..9b22c613a 100644 --- a/src/imap/scan_folders.rs +++ b/src/imap/scan_folders.rs @@ -73,7 +73,6 @@ impl Imap { // Don't scan folders that are watched anyway if !watched_folders.contains(&folder.name().to_string()) - && folder_meaning != FolderMeaning::Drafts && folder_meaning != FolderMeaning::Trash && folder_meaning != FolderMeaning::Unknown {