Mystara/refraction
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: use unwrap_or_default() for kick/ban reason

Browse source 
Signed-off-by: seth <getchoo@tuta.io>
This commit is contained in:
TheKodeToad 2023-12-04 15:54:16 +00:00 • committed by seth
parent 8bad9d9636
commit 640690d9bf
No known key found for this signature in database
GPG key ID: D31BD0D494BBEE86
1 changed files with 9 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/commands/moderation/actions.rs
View file

@ -7,11 +7,11 @@ fn create_moderation_embed(
title: String, title: String,
user: &User, user: &User,
delete_messages_days: Option<u8>, delete_messages_days: Option<u8>,
reason: String, reason: Option<String>,
) -> impl FnOnce(&mut CreateEmbed) -> &mut CreateEmbed { ) -> impl FnOnce(&mut CreateEmbed) -> &mut CreateEmbed {
let fields = [ let fields = [
("User", format!("{} ({})", user.name, user.id), false), ("User", format!("{} ({})", user.name, user.id), false),
("Reason", reason, false), ("Reason", reason.unwrap_or("None".to_string()), false),
( (
"Deleted messages", "Deleted messages",
format!("Last {} days", delete_messages_days.unwrap_or(0)), format!("Last {} days", delete_messages_days.unwrap_or(0)),
@ -39,13 +39,9 @@ pub async fn ban_user(
.guild() .guild()
.ok_or_else(|| eyre!("Couldn't get guild from message; Unable to ban!"))?; .ok_or_else(|| eyre!("Couldn't get guild from message; Unable to ban!"))?;
let reason = reason.unwrap_or("n/a".to_string()); guild
.ban_with_reason(ctx, &user, days, reason.clone().unwrap_or_default())
if reason != "n/a" { .await?;
guild.ban_with_reason(ctx, &user, days, &reason).await?;
} else {
guild.ban(ctx, &user, days).await?;
}
let embed = create_moderation_embed("User banned!".to_string(), &user, Some(days), reason); let embed = create_moderation_embed("User banned!".to_string(), &user, Some(days), reason);
@ -65,15 +61,12 @@ pub async fn kick_user(ctx: Context<'_>, user: User, reason: Option<String>) ->
.guild() .guild()
.ok_or_else(|| eyre!("Couldn't get guild from message; Unable to ban!"))?; .ok_or_else(|| eyre!("Couldn't get guild from message; Unable to ban!"))?;
let reason = reason.unwrap_or("n/a".to_string()); guild
.kick_with_reason(ctx, &user, &reason.clone().unwrap_or_default())
if reason != "n/a" { .await?;
guild.kick_with_reason(ctx, &user, &reason).await?;
} else {
guild.kick(ctx, &user).await?;
}
let embed = create_moderation_embed("User kicked!".to_string(), &user, None, reason); let embed = create_moderation_embed("User kicked!".to_string(), &user, None, reason);
ctx.send(|m| m.embed(embed)).await?; ctx.send(|m| m.embed(embed)).await?;
Ok(()) Ok(())