refactor(quark): port report_content & code clean-up

#283
This commit is contained in:
Paul Makles
2024-04-07 22:57:55 +01:00
parent 6b488f347e
commit 301676fb54
14 changed files with 281 additions and 154 deletions

View File

@@ -48,7 +48,7 @@ pub async fn ban(
// If member exists, check privileges against them
if let Ok(member) = target.as_member(db, &server.id).await {
if member.get_ranking(&query.server_ref().as_ref().unwrap())
if member.get_ranking(query.server_ref().as_ref().unwrap())
<= query.get_member_rank().unwrap_or(i64::MIN)
{
return Err(create_error!(NotElevated));

View File

@@ -31,7 +31,7 @@ pub async fn create(
let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
calculate_server_permissions(&mut query)
.await
.throw_if_lacking_channel_permission(ChannelPermission::ManageRole);
.throw_if_lacking_channel_permission(ChannelPermission::ManageRole)?;
let config = config().await;
if server.roles.len() >= config.features.limits.default.server_roles {

View File

@@ -22,7 +22,7 @@ pub async fn delete(
let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
calculate_server_permissions(&mut query)
.await
.throw_if_lacking_channel_permission(ChannelPermission::ManageRole);
.throw_if_lacking_channel_permission(ChannelPermission::ManageRole)?;
let member_rank = query.get_member_rank().unwrap_or(i64::MIN);

View File

@@ -32,7 +32,7 @@ pub async fn edit(
let mut query = DatabasePermissionQuery::new(db, &user).server(&server);
calculate_server_permissions(&mut query)
.await
.throw_if_lacking_channel_permission(ChannelPermission::ManageRole);
.throw_if_lacking_channel_permission(ChannelPermission::ManageRole)?;
let member_rank = query.get_member_rank().unwrap_or(i64::MIN);