Update async-smtp to 0.8

src/smtp/send.rs

@@ -1,8 +1,6 @@
 //! # SMTP message sending
 
-use std::time::Duration;
-
-use async_smtp::{EmailAddress, Envelope, SendableEmail, Transport};
+use async_smtp::{EmailAddress, Envelope, SendableEmail};
 
 use super::Smtp;
 use crate::config::Config;
@@ -19,9 +17,9 @@ pub(crate) const DEFAULT_MAX_SMTP_RCPT_TO: usize = 50;
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("Envelope error: {}", _0)]
-    Envelope(#[from] async_smtp::error::Error),
+    Envelope(anyhow::Error),
     #[error("Send error: {}", _0)]
-    SmtpSend(#[from] async_smtp::smtp::error::Error),
+    SmtpSend(async_smtp::error::Error),
     #[error("SMTP has no transport")]
     NoTransport,
     #[error("{}", _0)]
@@ -36,7 +34,6 @@ impl Smtp {
         context: &Context,
         recipients: &[EmailAddress],
         message: &[u8],
-        rowid: i64,
     ) -> Result<()> {
         if !context.get_config_bool(Config::Bot).await? {
             // Notify ratelimiter about sent message regardless of whether quota is exceeded or not.
@@ -62,19 +59,10 @@ impl Smtp {
 
             let envelope = Envelope::new(self.from.clone(), recipients_chunk.to_vec())
                 .map_err(Error::Envelope)?;
-            let mail = SendableEmail::new(
-                envelope,
-                rowid.to_string(), // only used for internal logging
-                message,
-            );
+            let mail = SendableEmail::new(envelope, message);
 
             if let Some(ref mut transport) = self.transport {
-                // The timeout is 1min + 3min per MB.
-                let timeout = 60 + (180 * message_len_bytes / 1_000_000) as u64;
-                transport
-                    .send_with_timeout(mail, Some(&Duration::from_secs(timeout)))
-                    .await
-                    .map_err(Error::SmtpSend)?;
+                transport.send(mail).await.map_err(Error::SmtpSend)?;
 
                 context.emit_event(EventType::SmtpMessageSent(format!(
                     "Message len={message_len_bytes} was smtp-sent to {recipients_display}"