Merge pull request 'Check if you are trying to kick owner' (#38) from wip/kick into main
Reviewed-on: #38 Reviewed-by: Radical <radical@radical.fun>
This commit is contained in:
commit
a1857a1939
3 changed files with 7 additions and 1 deletions
|
@ -51,7 +51,7 @@ pub async fn delete(
|
|||
let deleter = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
|
||||
|
||||
deleter
|
||||
.check_permission(&app_state, Permissions::ManageMember)
|
||||
.check_permission(&app_state, Permissions::KickMember)
|
||||
.await?;
|
||||
|
||||
member.delete(&mut conn).await?;
|
||||
|
|
|
@ -188,6 +188,9 @@ impl Member {
|
|||
}
|
||||
|
||||
pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> {
|
||||
if self.is_owner {
|
||||
return Err(Error::Forbidden("Can not kick owner".to_string()))
|
||||
}
|
||||
delete(guild_members::table)
|
||||
.filter(guild_members::uuid.eq(self.uuid))
|
||||
.execute(conn)
|
||||
|
|
|
@ -176,6 +176,8 @@ pub enum Permissions {
|
|||
ManageGuild = 32,
|
||||
/// Lets users change member settings (nickname, etc)
|
||||
ManageMember = 64,
|
||||
/// Lets users kick members
|
||||
KickMember = 256,
|
||||
}
|
||||
|
||||
impl Permissions {
|
||||
|
@ -188,6 +190,7 @@ impl Permissions {
|
|||
Self::ManageInvite,
|
||||
Self::ManageGuild,
|
||||
Self::ManageMember,
|
||||
Self::KickMember,
|
||||
];
|
||||
|
||||
all_perms
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue