jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix: route ranking

Browse Source
This commit is contained in:
Zomatree
2025-06-05 23:09:27 +01:00
committed by izzy
parent 1b2c7b2fa1
commit e00603f276
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/delta/src/routes/servers/roles_edit.rs
View File

@@ -12,7 +12,7 @@ use validator::Validate;
/// ///
/// Edit a role by its id. /// Edit a role by its id.
#[openapi(tag = "Server Permissions")] #[openapi(tag = "Server Permissions")]
#[patch("/<target>/roles/<role_id>", data = "<data>")] #[patch("/<target>/roles/<role_id>", data = "<data>", rank = 1)]
pub async fn edit( pub async fn edit(
db: &State<Database>, db: &State<Database>,
user: User, user: User,

35
crates/delta/src/routes/servers/roles_edit_positions.rs
View File

@@ -8,7 +8,7 @@ use revolt_models::v0;
/// ///
/// Edit's server role's ranks. /// Edit's server role's ranks.
#[openapi(tag = "Server Permissions")] #[openapi(tag = "Server Permissions")]
#[patch("/<target>/roles/ranks", data = "<data>", rank = 1)] #[patch("/<target>/roles/ranks", data = "<data>")]
pub async fn edit_role_ranks( pub async fn edit_role_ranks(
db: &State<Database>, db: &State<Database>,
user: User, user: User,
@@ -31,24 +31,27 @@ pub async fn edit_role_ranks(
return Err(create_error!(InvalidOperation)) return Err(create_error!(InvalidOperation))
} }
let member_top_rank = query.get_member_rank(); // dont have to check what the user cant modify if they are the server owner
if server.owner != user.id {
let member_top_rank = query.get_member_rank();
// find all roles above the member which we should not be able to reorder // find all roles above the member which we should not be able to reorder
let cant_modify = server.roles.clone() let cant_modify = server.roles.clone()
.into_iter() .into_iter()
.filter(|(_, role)| if let Some(top_rank) = member_top_rank { role.rank <= top_rank } else { true }) .filter(|(_, role)| if let Some(top_rank) = member_top_rank { role.rank <= top_rank } else { true })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
// check if any roles which we cant reorder have tried to been reordered // check if any roles which we cant reorder have tried to been reordered
if cant_modify.iter() if cant_modify.iter()
.any(|(id, _)| { .any(|(id, _)| {
let existing_rank = existing_order.iter().position(|existing_id| id == existing_id); let existing_rank = existing_order.iter().position(|existing_id| id == existing_id);
let new_rank = new_order.iter().position(|new_id| id == new_id); let new_rank = new_order.iter().position(|new_id| id == new_id);
existing_rank != new_rank existing_rank != new_rank
}) })
{ {
return Err(create_error!(NotElevated)) return Err(create_error!(NotElevated))
}
} }
// update the roles which have had their rank changed // update the roles which have had their rank changed