refactor(core): remove quark references from webhook routes
This commit is contained in:
@@ -1,6 +1,10 @@
|
||||
use revolt_database::{util::reference::Reference, Database, PartialWebhook};
|
||||
use revolt_database::{
|
||||
util::{permissions::DatabasePermissionQuery, reference::Reference},
|
||||
Database, PartialWebhook, User,
|
||||
};
|
||||
use revolt_models::v0::{DataEditWebhook, Webhook};
|
||||
use revolt_quark::{models::User, perms, Db, Error, Permission, Result};
|
||||
use revolt_permissions::{calculate_channel_permissions, ChannelPermission};
|
||||
use revolt_result::{create_error, Result};
|
||||
use rocket::{serde::json::Json, State};
|
||||
use validator::Validate;
|
||||
|
||||
@@ -11,22 +15,24 @@ use validator::Validate;
|
||||
#[patch("/<webhook_id>", data = "<data>")]
|
||||
pub async fn webhook_edit(
|
||||
db: &State<Database>,
|
||||
legacy_db: &Db,
|
||||
webhook_id: Reference,
|
||||
user: User,
|
||||
data: Json<DataEditWebhook>,
|
||||
) -> Result<Json<Webhook>> {
|
||||
let data = data.into_inner();
|
||||
data.validate()
|
||||
.map_err(|error| Error::FailedValidation { error })?;
|
||||
data.validate().map_err(|error| {
|
||||
create_error!(FailedValidation {
|
||||
error: error.to_string()
|
||||
})
|
||||
})?;
|
||||
|
||||
let mut webhook = webhook_id.as_webhook(db).await.map_err(Error::from_core)?;
|
||||
let channel = legacy_db.fetch_channel(&webhook.channel_id).await?;
|
||||
let mut 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?;
|
||||
let mut query = DatabasePermissionQuery::new(db, &user).channel(&channel);
|
||||
calculate_channel_permissions(&mut query)
|
||||
.await
|
||||
.throw_if_lacking_channel_permission(ChannelPermission::ManageWebhooks)?;
|
||||
|
||||
if data.name.is_none() && data.avatar.is_none() && data.remove.is_empty() {
|
||||
return Ok(Json(webhook.into()));
|
||||
@@ -48,16 +54,14 @@ pub async fn webhook_edit(
|
||||
if let Some(avatar) = avatar {
|
||||
let file = db
|
||||
.find_and_use_attachment(&avatar, "avatars", "user", &webhook.id)
|
||||
.await
|
||||
.map_err(Error::from_core)?;
|
||||
.await?;
|
||||
|
||||
partial.avatar = Some(file)
|
||||
}
|
||||
|
||||
webhook
|
||||
.update(db, partial, remove.into_iter().map(|v| v.into()).collect())
|
||||
.await
|
||||
.map_err(Error::from_core)?;
|
||||
.await?;
|
||||
|
||||
Ok(Json(webhook.into()))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user