refactor(core): remove quark references from webhook routes
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
use revolt_database::{util::reference::Reference, Database};
|
||||
use revolt_quark::{models::User, perms, Db, Error, Permission, Result};
|
||||
use revolt_database::{
|
||||
util::{permissions::DatabasePermissionQuery, reference::Reference},
|
||||
Database, User,
|
||||
};
|
||||
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
|
||||
use revolt_result::Result;
|
||||
use rocket::State;
|
||||
use rocket_empty::EmptyResponse;
|
||||
|
||||
@@ -10,21 +14,16 @@ use rocket_empty::EmptyResponse;
|
||||
#[delete("/<webhook_id>")]
|
||||
pub async fn webhook_delete(
|
||||
db: &State<Database>,
|
||||
legacy_db: &Db,
|
||||
user: User,
|
||||
webhook_id: Reference,
|
||||
) -> Result<EmptyResponse> {
|
||||
let webhook = webhook_id.as_webhook(db).await.map_err(Error::from_core)?;
|
||||
let channel = legacy_db.fetch_channel(&webhook.channel_id).await?;
|
||||
let webhook = webhook_id.as_webhook(db).await?;
|
||||
let channel = db.fetch_channel(&webhook.channel_id).await?;
|
||||
|
||||
perms(&user)
|
||||
.channel(&channel)
|
||||
.throw_permission(legacy_db, Permission::ManageWebhooks)
|
||||
.await?;
|
||||
|
||||
webhook
|
||||
.delete(db)
|
||||
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
|
||||
calculate_channel_permissions(&mut query)
|
||||
.await
|
||||
.map(|_| EmptyResponse)
|
||||
.map_err(Error::from_core)
|
||||
.throw_if_lacking_channel_permission(ChannelPermission::ManageWebhooks)?;
|
||||
|
||||
webhook.delete(db).await.map(|_| EmptyResponse)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user