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

Compare commits

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

No commits in common. "8c011d29fd906ef9670cac4db8ccfd2a17e0d34c" and "05a1ff5c7b91718f0be046d9f72b523297f5d6ae" have entirely different histories.
8c011d29fd ... 05a1ff5c7b

2 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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