jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

change how webhook information is in the webhook

Browse Source
This commit is contained in:
Zomatree
2023-04-01 22:49:34 +01:00
parent 01577fd798
commit 7b39f4e9d9
15 changed files with 31 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/delta/src/routes/channels/message_delete.rs
View File

@@ -11,7 +11,7 @@ pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResp
return Err(Error::NotFound);
}
if message.author.as_deref().unwrap_or_default() != user.id {
if message.author != user.id {
perms(&user)
.channel(&target.as_channel(db).await?)
.throw_permission(db, Permission::ManageMessages)

2
crates/delta/src/routes/channels/message_edit.rs
View File

@@ -43,7 +43,7 @@ pub async fn req(
return Err(Error::NotFound);
}
if message.author.as_deref().unwrap_or_default() != user.id {
if message.author != user.id {
return Err(Error::CannotEditMessage);
}

2
crates/delta/src/routes/channels/webhook_create.rs
View File

@@ -41,7 +41,7 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<CreateWebhookBody>
name: data.name,
avatar,
channel: channel.id().to_string(),
token: nanoid::nanoid!(64)
token: Some(nanoid::nanoid!(64))
};
webhook.create(db).await?;

2
crates/delta/src/routes/safety/report_content.rs
View File

@@ -42,7 +42,7 @@ pub async fn report_content(db: &Db, user: User, data: Json<DataReportContent>)
let message = db.fetch_message(id).await?;
// Users cannot report themselves
if message.author.as_ref() == Some(&user.id) {
if message.author == user.id {
return Err(Error::CannotReportYourself);
}

2
crates/delta/src/routes/webhooks/webhook_delete_token.rs
View File

@@ -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)?;

2
crates/delta/src/routes/webhooks/webhook_edit_token.rs
View File

@@ -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)?;

2
crates/delta/src/routes/webhooks/webhook_execute.rs
View File

@@ -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)?;

5
crates/delta/src/routes/webhooks/webhook_execute_github.rs
View File

@@ -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()
};

2
crates/delta/src/routes/webhooks/webhook_fetch_token.rs
View File

@@ -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)?;