Merge branch 'main' into feat/livekit

This commit is contained in:
Zomatree
2025-07-01 20:22:34 +01:00
49 changed files with 995 additions and 470 deletions

View File

@@ -13,7 +13,7 @@ use validator::Validate;
///
/// Edit a role by its id.
#[openapi(tag = "Server Permissions")]
#[patch("/<target>/roles/<role_id>", data = "<data>")]
#[patch("/<target>/roles/<role_id>", data = "<data>", rank = 1)]
pub async fn edit(
db: &State<Database>,
voice_client: &State<VoiceClient>,
@@ -47,22 +47,14 @@ pub async fn edit(
name,
colour,
hoist,
rank,
remove,
..
} = data;
// Prevent us from moving a role above other roles
if let Some(rank) = &rank {
if rank <= &member_rank {
return Err(create_error!(NotElevated));
}
}
let partial = PartialRole {
name,
colour,
hoist,
rank,
..Default::default()
};