fix: squash audit log branch changes

Signed-off-by: Zomatree <me@zomatree.live>
This commit is contained in:
Zomatree
2026-04-20 03:47:49 +01:00
parent 057f2bb8b3
commit ada0bc0f8e
57 changed files with 1923 additions and 153 deletions

View File

@@ -1,12 +1,14 @@
use revolt_database::{
util::{permissions::DatabasePermissionQuery, reference::Reference},
Database, User,
AuditLogEntryAction, Database, User,
};
use revolt_permissions::{calculate_server_permissions, ChannelPermission};
use revolt_result::Result;
use rocket::State;
use rocket_empty::EmptyResponse;
use crate::util::audit_log_reason::AuditLogReason;
/// # Unban user
///
/// Remove a user's ban.
@@ -15,6 +17,7 @@ use rocket_empty::EmptyResponse;
pub async fn unban(
db: &State<Database>,
user: User,
reason: AuditLogReason,
server: Reference<'_>,
target: Reference<'_>,
) -> Result<EmptyResponse> {
@@ -25,5 +28,13 @@ pub async fn unban(
.throw_if_lacking_channel_permission(ChannelPermission::BanMembers)?;
let ban = target.as_ban(db, &server.id).await?;
db.delete_ban(&ban.id).await.map(|_| EmptyResponse)
db.delete_ban(&ban.id).await?;
AuditLogEntryAction::BanDelete {
user: target.id.to_string(),
}
.insert(db, server.id, reason, user.id, Some(target.id.to_string()))
.await;
Ok(EmptyResponse)
}