From 4e4e598daf0e8583b3e3675a316dd75ac440da29 Mon Sep 17 00:00:00 2001 From: izzy Date: Sun, 8 Jun 2025 10:37:38 +0100 Subject: [PATCH] refactor: minor formatting changes --- .../core/database/src/models/servers/model.rs | 21 +++++---- crates/core/models/src/v0/servers.rs | 3 +- crates/delta/src/routes/servers/roles_edit.rs | 1 - .../routes/servers/roles_edit_positions.rs | 47 +++++++++++++------ 4 files changed, 44 insertions(+), 28 deletions(-) diff --git a/crates/core/database/src/models/servers/model.rs b/crates/core/database/src/models/servers/model.rs index 65d7d282..150f4f53 100644 --- a/crates/core/database/src/models/servers/model.rs +++ b/crates/core/database/src/models/servers/model.rs @@ -254,12 +254,12 @@ impl Server { } } - /// reorders the server's roles rankings - pub async fn update_role_rankings(&mut self, db: &Database, new_order: Vec) -> Result<()> { - // new_order must always contain every role + /// Reorders the server's roles rankings + pub async fn set_role_ordering(&mut self, db: &Database, new_order: Vec) -> Result<()> { + // New order must always contain every role debug_assert_eq!(self.roles.len(), new_order.len()); - // set the role's ranks to the positions in the vec + // Set the role's ranks to the positions in the vec for (rank, id) in new_order.iter().enumerate() { self.roles.get_mut(id).unwrap().rank = rank as i64; } @@ -270,13 +270,14 @@ impl Server { roles: Some(self.roles.clone()), ..Default::default() }, - Vec::new() - ).await?; + Vec::new(), + ) + .await?; - // publish bulk update event - EventV1::ServerRoleRanksUpdate { - ranks: new_order - }.p(self.id.clone()).await; + // Publish bulk update event + EventV1::ServerRoleRanksUpdate { ranks: new_order } + .p(self.id.clone()) + .await; Ok(()) } diff --git a/crates/core/models/src/v0/servers.rs b/crates/core/models/src/v0/servers.rs index 9e181176..4c7e1ee8 100644 --- a/crates/core/models/src/v0/servers.rs +++ b/crates/core/models/src/v0/servers.rs @@ -267,8 +267,7 @@ auto_derived!( pub hoist: Option, /// Ranking position /// - /// **Deprecated** - use the edit server role positions route. - /// Smaller values take priority. + /// **Removed** - no effect, use the edit server role positions route pub rank: Option, /// Fields to remove from role object #[cfg_attr(feature = "validator", validate(length(min = 1)))] diff --git a/crates/delta/src/routes/servers/roles_edit.rs b/crates/delta/src/routes/servers/roles_edit.rs index 78143bf2..f8152efe 100644 --- a/crates/delta/src/routes/servers/roles_edit.rs +++ b/crates/delta/src/routes/servers/roles_edit.rs @@ -46,7 +46,6 @@ pub async fn edit( colour, hoist, remove, - // rank is deprecated .. } = data; diff --git a/crates/delta/src/routes/servers/roles_edit_positions.rs b/crates/delta/src/routes/servers/roles_edit_positions.rs index 7e3b4d73..492f2511 100644 --- a/crates/delta/src/routes/servers/roles_edit_positions.rs +++ b/crates/delta/src/routes/servers/roles_edit_positions.rs @@ -1,8 +1,11 @@ -use revolt_database::{events::client::EventV1, util::{permissions::DatabasePermissionQuery, reference::Reference}, Database, PartialRole, PartialServer, User}; -use revolt_permissions::{calculate_server_permissions, ChannelPermission}; -use rocket::{serde::json::Json, State}; -use revolt_result::{create_error, Result}; +use revolt_database::{ + util::{permissions::DatabasePermissionQuery, reference::Reference}, + Database, User, +}; use revolt_models::v0; +use revolt_permissions::{calculate_server_permissions, ChannelPermission}; +use revolt_result::{create_error, Result}; +use rocket::{serde::json::Json, State}; /// # Edits server roles ranks /// @@ -26,27 +29,41 @@ pub async fn edit_role_ranks( let existing_order = server.roles.keys().cloned().collect::>(); let new_order = data.ranks.clone().into_iter().collect::>(); - // verify all roles are in the new ordering - if data.ranks.len() != server.roles.len() && server.roles.iter().all(|(id, _)| data.ranks.contains(id)) { - return Err(create_error!(InvalidOperation)) + // Verify all roles are in the new ordering + if data.ranks.len() != server.roles.len() + && server.roles.iter().all(|(id, _)| data.ranks.contains(id)) + { + return Err(create_error!(InvalidOperation)); } - // dont have to check what the user cant modify if they are the server owner + // Don't 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 then - // check if any roles which we cant reorder have tried to been reordered - if server.roles + if server + .roles .iter() - .filter(|(_, role)| if let Some(top_rank) = member_top_rank { role.rank <= top_rank } else { true }) - .any(|(id, _)| existing_order.iter().position(|existing_id| id == existing_id) != new_order.iter().position(|new_id| id == new_id)) + // Find all roles above the member which we should not be able to reorder + .filter(|(_, role)| { + if let Some(top_rank) = member_top_rank { + role.rank <= top_rank + } else { + true + } + }) + // Check if user is trying to reorder roles they can't reorder (as found previously) + .any(|(id, _)| { + existing_order + .iter() + .position(|existing_id| id == existing_id) + != new_order.iter().position(|new_id| id == new_id) + }) { - return Err(create_error!(NotElevated)) + return Err(create_error!(NotElevated)); } } - server.update_role_rankings(db, new_order).await?; + server.set_role_ordering(db, new_order).await?; Ok(Json(server.into())) }