Fix report, rm unused response, test discord

.github/workflows/report.py

@@ -61,7 +61,6 @@
 
 entries = sorted(entries, key = lambda x: x[1])
 
-print(covered, coverable)
 this_coverage = round(100.0*covered/coverable, 2)
 
 diff = None

src/server/api/stats.rs

@@ -146,7 +146,7 @@ impl ApiRequest for StatsDigest
 
         if self.payload.post_discord
         {
-            match post(config.notification_endpoint, msg.clone()).await
+            match post(&config.notification_endpoint, msg.clone()).await
             {
                 Ok(_s) => (),
                 Err(e) => {crate::debug(format!("Error posting to discord\n{}", e), None);}

src/web/discord/request/model.rs

@@ -14,8 +14,8 @@ impl Webhook
         Webhook { addr: url }
     }
 
-    pub fn get_addr(self: Webhook) -> String 
+    pub fn get_addr(&self) -> String 
     {
-        self.addr
+        self.addr.clone()
     }
 }

src/web/discord/request/post.rs

@@ -19,7 +19,7 @@ use crate::web::discord::request::model::Webhook;
 /// 
 /// pub async fn post_to_discord(){
 ///     let w = Webhook::new("https://discord.com/api/webhooks/xxx/yyy".to_string());
-///     post(w, "this is some plaintext".to_string());
+///     post(&w, "this is some plaintext".to_string());
 /// }
 /// ```
 /// 
@@ -34,7 +34,7 @@ use crate::web::discord::request::model::Webhook;
 ///  {"content": "this is some plaintext"}
 /// ``` 
 
-pub async fn post(w: Webhook, msg: String) -> Result<String, reqwest::Error>
+pub async fn post(w: &Webhook, msg: String) -> Result<String, reqwest::Error>
 {
 
     crate::debug(format!("Posting to Discord {:?}", msg), None);
@@ -43,7 +43,7 @@ pub async fn post(w: Webhook, msg: String) -> Result<String, reqwest::Error>
     let mut map = HashMap::new();
     map.insert("content", &msg);
 
-    match client.post(&w.get_addr())
+    match client.post(w.clone().get_addr())
         .json(&map)
         .send()
         .await

src/web/mod.rs

@@ -9,7 +9,6 @@ use regex::Regex;
 use crate::util::{read_bytes, dump_bytes};
 
 pub mod throttle;
-pub mod response;
 pub mod discord;
 pub mod stats;
 

src/web/stats.rs

@@ -566,7 +566,7 @@ impl Stats
                 {
                     stats.summary = Self::process_hits(stats_config.path.clone(), Some(stats.last_digest), None, stats_config.top_n_digest, Some(stats.to_owned()));
                     let msg = Stats::digest_message(stats.summary.clone(), Some(stats.last_digest), None);
-                    match post(config.notification_endpoint, msg).await
+                    match post(&config.notification_endpoint, msg).await
                     {
                         Ok(_s) => (),
                         Err(e) => {crate::debug(format!("Error posting to discord\n{}", e), None);}

src/web/throttle.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::net::{SocketAddr, Ipv4Addr, IpAddr};
 use std::time::{Instant, Duration};
 use std::sync::Arc;
-use openssl::sha::{self, sha512};
+use openssl::sha::sha512;
 use tokio::sync::Mutex;
 
 use axum::

tests/test_discord.rs

@@ -0,0 +1,18 @@
+mod common;
+
+#[cfg(test)]
+mod discord
+{
+    use busser::web::discord::request::{model::Webhook, post::post};
+
+
+    #[tokio::test]
+    async fn test_webhook()
+    {
+        let w = Webhook::new("https://discord.com/api/webhooks/xxx/yyy".to_string());
+
+        assert_eq!(w.get_addr(), "https://discord.com/api/webhooks/xxx/yyy");
+
+        assert!(post(&w, "400".to_string()).await.is_ok());
+    }
+}