shell.nix

@@ -8,8 +8,6 @@ pkgs.mkShell {
     rust-analyzer
     clippy
 
-    bacon
-
     pkg-config
     openssl
   ];

src/main.rs

@@ -130,8 +130,31 @@ async fn _post_comment(
         }
         None => return Err(Error::InvalidUrl), // e.g. 404
     };
-    // TODO: Use web::block
+    // TODO: Clean up webhook integration
-    // Create comment in database
+    {
+        let database = data.get_db(&origin)?;
+        if let Some(webhook) = &database.settings.webhook {
+            let client = WebhookClient::new(&webhook);
+            client.send(|message| {
+                let author = match &comment.author {
+                    Some(author) => &author,
+                    None => "Annonymous",
+                };
+                message
+                    .username(&author)
+                    .avatar_url(&format!(
+                        "https://www.gravatar.com/avatar/{}?d=mp",
+                        get_gravatar(&comment.email)
+                    ))
+                    .embed(|embed| embed
+                        .title(&format!("New comment on {}", page_data.content_id))
+                        .description(&comment.text)
+                    )
+                }
+            ).await.unwrap();
+        }
+    }
+    web::block(move || {
         let database = data.get_db(&origin)?;
         if comment.author.is_none() && database.settings.name_required {
             return Err(Error::NameRequired);
@@ -154,46 +177,8 @@ async fn _post_comment(
             }
         }
         database.create_comment(&comment)?;
-    // Send notification webhook
+        Ok(())
-    if let Some(webhook) = &database.settings.webhook {
+    }).await?.unwrap();
-        let client = WebhookClient::new(&webhook);
-        client.send(|message| {
-            let author = match &comment.author {
-                Some(author) => &author,
-                None => "Annonymous",
-            };
-            message
-                .username(&author)
-                .avatar_url(&format!(
-                    "https://www.gravatar.com/avatar/{}?d=mp",
-                    get_gravatar(&comment.email)
-                ))
-                .embed(|embed| embed
-                    .title(&format!("New comment on {}", page_data.content_id))
-                    .description(&comment.text)
-                    .field("Link", &format!("{}#{}",
-                        &url // Remove any trailing hash from URL
-                            .split("#")
-                            .next()
-                            .unwrap(),
-                        &database // Get ID of just created comment
-                            .get_comments(&page_data.content_id)
-                            .unwrap()
-                            .first() // returned in reverse chronological order
-                            .unwrap()
-                            .id
-                            .unwrap()
-                        ), true)
-                    .field("Content ID", &page_data.content_id, true)
-                    .field("Email", match &comment.email {
-                        Some(email) => email,
-                        None => "None",
-                    }, false)
-                )
-            }
-        ).await.unwrap();
-    }
-
     Ok(())
 }