gorb/backend
5
0
Fork 0
Code Issues 16 Pull requests 2 Projects Releases Packages 1 Wiki Activity Actions

WIP: Audit Logs #45

Draft
baaboe wants to merge 13 commits from wip/auditlog into main
pull from: wip/auditlog
merge into: gorb:main
Conversation 1 Commits 13 Files changed 16 +12 -12
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e663c1bbae - Show all commits

12
src/api/v1/channels/uuid/mod.rs
View file

@ -51,9 +51,9 @@ pub async fn delete(
.check_permission(&mut conn, &app_state.cache_pool, Permissions::ManageChannel) .check_permission(&mut conn, &app_state.cache_pool, Permissions::ManageChannel)
.await?; .await?;
let log_entrie = AuditLog::new(channel.guild_uuid, AuditLogId::ChannelDelete as i16, member.uuid, None, None, None, None, Some(channel.name.clone()), None, None).await; let log_entry = AuditLog::new(channel.guild_uuid, AuditLogId::ChannelDelete as i16, member.uuid, None, None, None, None, Some(channel.name.clone()), None, None).await;
channel.delete(&mut conn, &app_state.cache_pool).await?; channel.delete(&mut conn, &app_state.cache_pool).await?;
log_entrie.push(&mut conn).await?; log_entry.push(&mut conn).await?;
Ok(StatusCode::OK) Ok(StatusCode::OK)
} }
@ -115,15 +115,15 @@ pub async fn patch(
.await?; .await?;
if let Some(new_name) = &new_info.name { if let Some(new_name) = &new_info.name {
let log_entrie = AuditLog::new(channel.guild_uuid, AuditLogId::ChannelUpdateName as i16, member.uuid, Some(channel_uuid), None, None, None, None, Some(channel.name.clone()), Some(new_name.clone())).await; let log_entry = AuditLog::new(channel.guild_uuid, AuditLogId::ChannelUpdateName as i16, member.uuid, Some(channel_uuid), None, None, None, None, Some(channel.name.clone()), Some(new_name.clone())).await;
channel channel
.set_name(&mut conn, &app_state.cache_pool, new_name.to_string()) .set_name(&mut conn, &app_state.cache_pool, new_name.to_string())
.await?; .await?;
log_entrie.push(&mut conn).await?; log_entry.push(&mut conn).await?;
} }
if let Some(new_description) = &new_info.description { if let Some(new_description) = &new_info.description {
let log_entrie = AuditLog::new(channel.guild_uuid, AuditLogId::ChannelUpdateDescripiton as i16, member.uuid, Some(channel_uuid), None, None, None, None, Some(channel.description.clone().unwrap_or("".to_string())), Some(new_description.clone())).await; let log_entry = AuditLog::new(channel.guild_uuid, AuditLogId::ChannelUpdateDescripiton as i16, member.uuid, Some(channel_uuid), None, None, None, None, Some(channel.description.clone().unwrap_or("".to_string())), Some(new_description.clone())).await;
channel channel
.set_description( .set_description(
&mut conn, &mut conn,
@ -131,7 +131,7 @@ pub async fn patch(
new_description.to_string(), new_description.to_string(),
) )
.await?; .await?;
log_entrie.push(&mut conn).await?; log_entry.push(&mut conn).await?;
} }
if let Some(new_is_above) = &new_info.is_above { if let Some(new_is_above) = &new_info.is_above {

4
src/api/v1/guilds/uuid/bans.rs
View file

@ -47,9 +47,9 @@ pub async fn unban(
let ban = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await?; let ban = GuildBan::fetch_one(&mut conn, guild_uuid, user_uuid).await?;
let log_entrie = AuditLog::new(guild_uuid, AuditLogId::MemberUnban as i16, caller.uuid, None, Some(ban.user_uuid), None, None, None, None, None).await; let log_entry = AuditLog::new(guild_uuid, AuditLogId::MemberUnban as i16, caller.uuid, None, Some(ban.user_uuid), None, None, None, None, None).await;
ban.unban(&mut conn).await?; ban.unban(&mut conn).await?;
log_entrie.push(&mut conn).await?; log_entry.push(&mut conn).await?;
Ok(StatusCode::OK) Ok(StatusCode::OK)
} }

4
src/api/v1/members/uuid/ban.rs
View file

@ -38,9 +38,9 @@ pub async fn post(
.check_permission(&mut conn, &app_state.cache_pool, Permissions::BanMember) .check_permission(&mut conn, &app_state.cache_pool, Permissions::BanMember)
.await?; .await?;
let log_entrie = AuditLog::new(member.guild_uuid, AuditLogId::MemberBan as i16, caller.uuid, None, Some(member.user_uuid), None, None, Some(payload.reason.clone()), None, None).await; let log_entry = AuditLog::new(member.guild_uuid, AuditLogId::MemberBan as i16, caller.uuid, None, Some(member.user_uuid), None, None, Some(payload.reason.clone()), None, None).await;
member.ban(&mut conn, &payload.reason).await?; member.ban(&mut conn, &payload.reason).await?;
log_entrie.push(&mut conn).await?; log_entry.push(&mut conn).await?;
Ok(StatusCode::OK) Ok(StatusCode::OK)
} }

4
src/api/v1/members/uuid/mod.rs
View file

@ -54,9 +54,9 @@ pub async fn delete(
Member::fetch_one_with_uuid(&mut conn, &app_state.cache_pool, Some(&me), member_uuid) Member::fetch_one_with_uuid(&mut conn, &app_state.cache_pool, Some(&me), member_uuid)
.await?; .await?;
let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
deleter caller
.check_permission(&mut conn, &app_state.cache_pool, Permissions::KickMember) .check_permission(&mut conn, &app_state.cache_pool, Permissions::KickMember)
.await?; .await?;