Fetch and store modifiers are parsed

1 files changed, 6 insertions, 4 deletions

diff --git a/src/imap/command/selected.rs b/src/imap/command/selected.rs
index de59ed3..862d4aa 100644
--- a/src/imap/command/selected.rs
+++ b/src/imap/command/selected.rs
@@ -1,8 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::Result;
-use imap_codec::imap_types::command::{Command, CommandBody, StoreModifier};
-use imap_codec::imap_types::core::{Charset, Atom};
+use imap_codec::imap_types::command::{Command, CommandBody, FetchModifier, StoreModifier};
+use imap_codec::imap_types::core::Charset;
 use imap_codec::imap_types::fetch::MacroOrMessageDataItemNames;
 use imap_codec::imap_types::flag::{Flag, StoreResponse, StoreType};
 use imap_codec::imap_types::mailbox::Mailbox as MailboxCodec;
@@ -43,8 +43,9 @@ pub async fn dispatch<'a>(
         CommandBody::Fetch {
             sequence_set,
             macro_or_item_names,
+            modifiers,
             uid,
-        } => ctx.fetch(sequence_set, macro_or_item_names, uid).await,
+        } => ctx.fetch(sequence_set, macro_or_item_names, modifiers, uid).await,
         CommandBody::Search {
             charset,
             criteria,
@@ -114,6 +115,7 @@ impl<'a> SelectedContext<'a> {
         self,
         sequence_set: &SequenceSet,
         attributes: &'a MacroOrMessageDataItemNames<'static>,
+        modifiers: &[FetchModifier],
         uid: &bool,
     ) -> Result<(Response<'static>, flow::Transition)> {
         match self.mailbox.fetch(sequence_set, attributes, uid).await {
@@ -194,7 +196,7 @@ impl<'a> SelectedContext<'a> {
         kind: &StoreType,
         response: &StoreResponse,
         flags: &[Flag<'a>],
-        modifiers: &[(Atom<'a>, StoreModifier<'a>)],
+        modifiers: &[StoreModifier],
         uid: &bool,
     ) -> Result<(Response<'static>, flow::Transition)> {
         tracing::info!(modifiers=?modifiers);