refactor(webhooks): pass trigger to other webhook events

Author: dan-online

crates/service/src/runner.rs

@@ -137,17 +137,29 @@ impl PulseRunner {
                 sify(&processed)
             );
 
-            self.webhooks
-                .add_event(EventType::Processed, None, &processed)
-                .await;
+            for ev in &processed {
+                self.webhooks
+                    .add_event(
+                        EventType::Processed,
+                        Some(ev.event_source.clone()),
+                        &[ev.file_path.clone()],
+                    )
+                    .await;
+            }
         }
 
         if !retrying.is_empty() {
             warn!("retrying {} file{}", retrying.len(), sify(&retrying));
 
-            self.webhooks
-                .add_event(EventType::Retrying, None, &retrying)
-                .await;
+            for ev in &retrying {
+                self.webhooks
+                    .add_event(
+                        EventType::Retrying,
+                        Some(ev.event_source.clone()),
+                        &[ev.file_path.clone()],
+                    )
+                    .await;
+            }
         }
 
         if !failed.is_empty() {
@@ -157,9 +169,15 @@ impl PulseRunner {
                 sify(&failed)
             );
 
-            self.webhooks
-                .add_event(EventType::Error, None, &failed)
-                .await;
+            for ev in &failed {
+                self.webhooks
+                    .add_event(
+                        EventType::Failed,
+                        Some(ev.event_source.clone()),
+                        &[ev.file_path.clone()],
+                    )
+                    .await;
+            }
         }
 
         Ok(())
@@ -168,7 +186,7 @@ impl PulseRunner {
     async fn process_events(
         &self,
         evs: &mut [ScanEvent],
-    ) -> anyhow::Result<(Vec<String>, Vec<String>, Vec<String>)> {
+    ) -> anyhow::Result<(Vec<ScanEvent>, Vec<ScanEvent>, Vec<ScanEvent>)> {
         let mut failed_ids = vec![];
 
         let trigger_settings = &self.settings.triggers;
@@ -227,20 +245,20 @@ impl PulseRunner {
                 if ev.failed_times >= self.settings.opts.max_retries {
                     ev.process_status = ProcessStatus::Failed.into();
                     ev.next_retry_at = None;
-                    failed.push(conn.save_changes(ev)?.file_path.clone());
+                    failed.push(conn.save_changes(ev)?);
                 } else {
                     let next_retry = chrono::Utc::now().naive_utc()
                         + chrono::Duration::seconds(2_i64.pow(ev.failed_times as u32 + 1));
 
                     ev.process_status = ProcessStatus::Retry.into();
                     ev.next_retry_at = Some(next_retry);
 
-                    retrying.push(conn.save_changes(ev)?.file_path.clone());
+                    retrying.push(conn.save_changes(ev)?);
                 }
             } else {
                 ev.process_status = ProcessStatus::Complete.into();
                 ev.processed_at = Some(chrono::Utc::now().naive_utc());
-                succeeded.push(conn.save_changes(ev)?.file_path.clone());
+                succeeded.push(conn.save_changes(ev)?);
             }
         }
 

crates/service/src/settings/webhooks/discord.rs

@@ -68,10 +68,10 @@ impl DiscordWebhook {
 
         for (event, trigger, files) in batch {
             let color = match event {
-                EventType::New => 6_061_450,    // grey
-                EventType::Found => 52084,      // green
-                EventType::Error => 16_711_680, // red
-                EventType::Processed => 39129,  // blue
+                EventType::New => 6_061_450,     // grey
+                EventType::Found => 52084,       // green
+                EventType::Failed => 16_711_680, // red
+                EventType::Processed => 39129,   // blue
                 EventType::Retrying | EventType::HashMismatch => 16_776_960,
             };
 

crates/service/src/settings/webhooks/manager.rs

@@ -19,8 +19,8 @@ pub enum EventType {
     Retrying = 3,
     /// Processed event
     Processed = 4,
-    /// Error event
-    Error = 5,
+    /// Failed event
+    Failed = 5,
 }
 
 impl Display for EventType {
@@ -29,7 +29,7 @@ impl Display for EventType {
             Self::New => "NEW",
             Self::Retrying => "RETRY",
             Self::Found => "FOUND",
-            Self::Error => "ERROR",
+            Self::Failed => "FAILED",
             Self::Processed => "PROCESSED",
             Self::HashMismatch => "HASH MISMATCH",
         };
@@ -44,7 +44,7 @@ impl EventType {
             Self::New => "added",
             Self::Found => "found",
             Self::Retrying => "retrying",
-            Self::Error => "failed",
+            Self::Failed => "failed",
             Self::Processed => "processed",
             Self::HashMismatch => "mismatched",
         }