raphael/tty
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: raphael:05a1ff5c7b91718f0be046d9f72b523297f5d6ae
Branches Tags
raphael:main
raphael:feat/moderation/classic
...
compare: raphael:8c011d29fd906ef9670cac4db8ccfd2a17e0d34c
Branches Tags
raphael:feat/moderation/classic
raphael:main

2 commits
05a1ff5c7b ... 8c011d29fd

Author SHA1 Message Date
Raphael
8c011d29fd
fix(command/moderation): adding the position 0 for ban 
The serenity lib return None on .member_highest_role so adding an
unwrap_or(0)
 2026-03-16 14:40:20 +01:00
Raphael
38228d8cee
fix(command/moderation): adding the position 0 for kick 
The serenity lib return None on .member_highest_role so adding an
unwrap_or(0)
 2026-03-16 14:40:17 +01:00
2 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/commands/moderation/ban.rs
View file

@ -82,10 +82,19 @@ impl SlashCommand for Ban {
command.create_response(&ctx.http, response).await?;
return Ok(());
}
let target_role: &Role = guild.member_highest_role(&target_member).unwrap();
let executor_role: &Role = guild.member_highest_role(&executor_member).unwrap();
let bot_role: &Role = guild.member_highest_role(&bot_member).unwrap();
if target_role > executor_role || target_role > bot_role || target_id == guild.owner_id {
let target_role_pos: u16 = guild
.member_highest_role(&target_member)
.map(|r| r.position)
.unwrap_or(0);
let executor_role_pos: u16 = guild
.member_highest_role(&executor_member)
.map(|r| r.position)
.unwrap_or(0);
let bot_role_pos: u16 = guild
.member_highest_role(&bot_member)
.map(|r| r.position)
.unwrap_or(0);
if target_role_pos > executor_role_pos || target_role_pos > bot_role_pos || target_id == guild.owner_id {
let message: CreateInteractionResponseMessage = CreateInteractionResponseMessage::new()
.content(format!("{} | You cannot ban this user because they are hierarchically above you", _emoji.answer.error))
.ephemeral(true);

17
src/commands/moderation/kick.rs
View file

@ -82,10 +82,19 @@ impl SlashCommand for Kick {
command.create_response(&ctx.http, response).await?;
return Ok(());
}
let target_role: &Role = guild.member_highest_role(&target_member).unwrap();
let executor_role: &Role = guild.member_highest_role(&executor_member).unwrap();
let bot_role: &Role = guild.member_highest_role(&bot_member).unwrap();
if target_role > executor_role || target_role > bot_role || target_id == guild.owner_id {
let target_role_pos: u16 = guild
.member_highest_role(&target_member)
.map(|r| r.position)
.unwrap_or(0);
let executor_role_pos: u16 = guild
.member_highest_role(&executor_member)
.map(|r| r.position)
.unwrap_or(0);
let bot_role_pos: u16 = guild
.member_highest_role(&bot_member)
.map(|r| r.position)
.unwrap_or(0);
if target_role_pos > executor_role_pos || target_role_pos > bot_role_pos || target_id == guild.owner_id {
let message: CreateInteractionResponseMessage = CreateInteractionResponseMessage::new()
.content(format!("{} | You cannot kick this user because they are hierarchically above you", _emoji.answer.error))
.ephemeral(true);