melib/nntp: set appropriate ErrorKind to errors

epilys · epilys · commit a67299ebb32d · 2025-02-11T12:45:53.000+02:00
Signed-off-by: Manos Pitsidianakis &lt;manos@pitsidianak.is&gt;
diff --git a/melib/src/nntp/connection.rs b/melib/src/nntp/connection.rs
@@ -117,9 +117,10 @@ impl NntpStream {
                     .await?;
                 if !res.starts_with("101 ") {
                     return Err(Error::new(format!(
-                        "Could not connect to {}: expected CAPABILITIES response but got:{}",
+                        "Could not connect to {}: expected CAPABILITIES response but got: {}",
                         &server_conf.server_hostname, res
-                    )));
+                    ))
+                    .set_kind(ErrorKind::ProtocolError));
                 }
                 let capabilities: Vec<&str> = res.lines().skip(1).collect();
 
@@ -130,16 +131,17 @@ impl NntpStream {
                     return Err(Error::new(format!(
                         "Could not connect to {}: server is not NNTP VERSION 2 compliant",
                         &server_conf.server_hostname
-                    )));
+                    ))
+                    .set_kind(ErrorKind::ProtocolNotSupported));
                 }
                 if !capabilities
                     .iter()
                     .any(|cap| cap.eq_ignore_ascii_case("STARTTLS"))
                 {
                     return Err(Error::new(format!(
-                        "Could not connect to {}: server does not support STARTTLS",
+                        "Could not connect to {}: server does not support STARTTLS but it was required by user configuration",
                         &server_conf.server_hostname
-                    )));
+                    )).set_kind(ErrorKind::NotSupported));
                 }
                 ret.stream.write_all(b"STARTTLS\r\n").await?;
                 ret.stream.flush().await?;
diff --git a/melib/src/nntp/mod.rs b/melib/src/nntp/mod.rs
@@ -429,7 +429,7 @@ impl MailBackend for NntpType {
         _mailbox_hash: MailboxHash,
         _flags: Option<Flag>,
     ) -> ResultFuture<()> {
-        Err(Error::new("NNTP doesn't support saving."))
+        Err(Error::new("NNTP doesn't support saving.").set_kind(ErrorKind::NotSupported))
     }
 
     fn copy_messages(
@@ -439,7 +439,7 @@ impl MailBackend for NntpType {
         _destination_mailbox_hash: MailboxHash,
         _move_: bool,
     ) -> ResultFuture<()> {
-        Err(Error::new("NNTP doesn't support copying/moving."))
+        Err(Error::new("NNTP doesn't support copying/moving.").set_kind(ErrorKind::NotSupported))
     }
 
     fn set_flags(
@@ -504,7 +504,7 @@ impl MailBackend for NntpType {
         _env_hashes: EnvelopeHashBatch,
         _mailbox_hash: MailboxHash,
     ) -> ResultFuture<()> {
-        Err(Error::new("NNTP doesn't support deletion."))
+        Err(Error::new("NNTP doesn't support deletion.").set_kind(ErrorKind::NotSupported))
     }
 
     fn as_any(&self) -> &dyn std::any::Any {
@@ -525,7 +525,7 @@ impl MailBackend for NntpType {
     ) -> ResultFuture<(MailboxHash, HashMap<MailboxHash, Mailbox>)> {
         Err(
             Error::new("Creating mailbox is not supported for nntp backend.")
-                .set_kind(ErrorKind::NotImplemented),
+                .set_kind(ErrorKind::NotSupported),
         )
     }
 
@@ -593,7 +593,9 @@ impl MailBackend for NntpType {
             let mut conn = timeout(timeout_dur, connection.lock()).await?;
             let stream = conn.stream.as_ref()?;
             if !stream.supports_submission {
-                return Err(Error::new("Server prohibits posting."));
+                return Err(
+                    Error::new("Server prohibits posting.").set_kind(ErrorKind::NotSupported)
+                );
             }
             // [ref:TODO] normalize CRLF in `bytes`
             let mut res = String::with_capacity(8 * 1024);
