Compare commits

..

No commits in common. "bb8927840de568b76e3d3e3aa6de9c3011967f15" and "cbdf6f79e2f55f76fb6174ecd6496d65e58972f9" have entirely different histories.

2 changed files with 4 additions and 5 deletions

View file

@ -36,7 +36,6 @@ pub async fn post(
let member = Member::fetch_one_with_member(&app_state, None, member_uuid).await?; let member = Member::fetch_one_with_member(&app_state, None, member_uuid).await?;
let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?; let caller = Member::check_membership(&mut conn, uuid, member.guild_uuid).await?;
caller caller
.check_permission(&app_state, Permissions::BanMember) .check_permission(&app_state, Permissions::BanMember)
.await?; .await?;

View file

@ -208,6 +208,10 @@ impl Member {
} }
pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> { pub async fn delete(self, conn: &mut Conn) -> Result<(), Error> {
if self.is_owner {
return Err(Error::Forbidden("Can not ban owner".to_string()));
}
delete(guild_members::table) delete(guild_members::table)
.filter(guild_members::uuid.eq(self.uuid)) .filter(guild_members::uuid.eq(self.uuid))
.execute(conn) .execute(conn)
@ -217,10 +221,6 @@ impl Member {
} }
pub async fn ban(self, conn: &mut Conn, reason: &String) -> Result<(), Error> { pub async fn ban(self, conn: &mut Conn, reason: &String) -> Result<(), Error> {
if self.is_owner {
return Err(Error::Forbidden("Can not ban owner".to_string()));
}
use guild_bans::dsl; use guild_bans::dsl;
insert_into(guild_bans::table) insert_into(guild_bans::table)
.values(( .values((