Support attaching multiple files in Telegram

notificohq · Dec 21, 2024 · 999605c · 999605c
1 parent 47f1c0d
commit 999605c
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 69 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/notifico-attachment/src/lib.rs b/notifico-attachment/src/lib.rs
@@ -73,7 +73,7 @@ pub struct AttachedFile {
     pub file_name: String,
     pub mime_type: Mime,
     pub size: u64,
-    pub plugin_values: HashMap<String, String>,
+    pub extras: HashMap<String, String>,
 }
 
 impl AttachedFile {
@@ -111,7 +111,7 @@ impl AttachmentPlugin {
                 file_name,
                 mime_type,
                 size,
-                plugin_values: HashMap::new(),
+                extras: info.extras.clone(),
             });
         }
         unimplemented!()

diff --git a/notifico-core/src/engine/mod.rs b/notifico-core/src/engine/mod.rs
@@ -27,6 +27,7 @@ pub struct EventContext(pub Map<String, Value>);
 pub struct AttachmentMetadata {
     pub url: Url,
     pub file_name: Option<String>,
+    pub extras: HashMap<String, String>,
 }
 
 #[derive(Default, Clone, Debug, Serialize, Deserialize)]

diff --git a/notificox/src/main.rs b/notificox/src/main.rs
@@ -17,6 +17,7 @@ use notifico_template::source::fs::FilesystemSource;
 use notifico_template::{PreRenderedTemplate, TemplateSelector, Templater};
 use notifico_transports::all_transports;
 use serde_json::json;
+use std::collections::HashMap;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -177,6 +178,7 @@ async fn main() {
                         attachments.push(AttachmentMetadata {
                             url: Url::from_file_path(abspath).unwrap(),
                             file_name: None,
+                            extras: HashMap::new(),
                         })
                     }
 

diff --git a/transports/notifico-smtp/src/lib.rs b/transports/notifico-smtp/src/lib.rs
@@ -141,7 +141,7 @@ impl EmailTransport {
         let mut attachments_inline = vec![];
 
         for attachment in attachments {
-            if attachment.plugin_values.contains_key("email.cid") {
+            if attachment.extras.contains_key("email.cid") {
                 attachments_inline.push(attachment);
             } else {
                 attachments_mixed.push(attachment);
@@ -165,7 +165,7 @@ impl EmailTransport {
                 let mut mp_related = MultiPart::related().build();
                 mp_related = mp_related.singlepart(SinglePart::html(rendered.body_html));
                 for mut attachment in attachments_inline {
-                    let cid = attachment.plugin_values.get("email.cid").unwrap().clone();
+                    let cid = attachment.extras.get("email.cid").unwrap().clone();
 
                     let content_type = ContentType::parse(attachment.mime_type.as_ref()).unwrap();
                     let attach =