change how webhook information is in the webhook

crates/delta/src/routes/webhooks/webhook_delete_token.rs

@@ -8,7 +8,7 @@ use revolt_quark::{Db, Ref, Result, EmptyResponse, Error};
 pub async fn req(db: &Db, target: Ref, token: String) -> Result<EmptyResponse> {
     let webhook = target.as_webhook(db).await?;
 
-    (webhook.token == token)
+    (webhook.token.as_deref() == Some(&token))
         .then_some(())
         .ok_or(Error::InvalidCredentials)?;
 

crates/delta/src/routes/webhooks/webhook_edit_token.rs

@@ -27,7 +27,7 @@ pub async fn req(db: &Db, target: Ref, token: String, data: Json<WebhookEditBody
 
     let mut webhook = target.as_webhook(db).await?;
 
-    (webhook.token == token)
+    (webhook.token.as_deref() == Some(&token))
         .then_some(())
         .ok_or(Error::InvalidCredentials)?;
 

crates/delta/src/routes/webhooks/webhook_execute.rs

@@ -15,7 +15,7 @@ pub async fn req(db: &Db, target: Ref, token: String, data: Json<DataMessageSend
 
     let webhook = target.as_webhook(db).await?;
 
-    (webhook.token == token)
+    (webhook.token.as_deref() == Some(&token))
         .then_some(())
         .ok_or(Error::InvalidCredentials)?;
 

crates/delta/src/routes/webhooks/webhook_execute_github.rs

@@ -745,7 +745,7 @@ fn convert_event(data: &str, event_name: &str) -> Result<Event> {
 pub async fn req(db: &Db, target: Ref, token: String, event: EventHeader<'_>, data: String) -> Result<()> {
     let webhook = target.as_webhook(db).await?;
 
-    (webhook.token == token)
+    (webhook.token.as_deref() == Some(&token))
         .then_some(())
         .ok_or(Error::InvalidCredentials)?;
 
@@ -978,9 +978,10 @@ pub async fn req(db: &Db, target: Ref, token: String, event: EventHeader<'_>, da
 
     let mut message = Message {
         id: message_id,
+        author: webhook.id.clone(),
         channel: webhook.channel.clone(),
         embeds: Some(vec![embed]),
-        webhook: Some(webhook.id.clone()),
+        webhook: Some(webhook.clone()),
         ..Default::default()
     };
 

crates/delta/src/routes/webhooks/webhook_fetch_token.rs

@@ -9,7 +9,7 @@ use rocket::serde::json::Json;
 pub async fn req(db: &Db, target: Ref, token: String) -> Result<Json<Webhook>> {
     let webhook = target.as_webhook(db).await?;
 
-    (webhook.token == token)
+    (webhook.token.as_deref() == Some(&token))
         .then_some(())
         .ok_or(Error::InvalidCredentials)?;