git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-10 00:23:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

perf(MSC4323): Parallelise some check futs

Browse source
This commit is contained in:
nexy7574 2025-09-01 11:36:39 +01:00
commit d970df5fd2
No known key found for this signature in database
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/api/client/admin/suspend.rs
View file

@ -1,5 +1,6 @@
use axum::extract::State; use axum::extract::State;
use conduwuit::{Err, Result}; use conduwuit::{Err, Result};
use futures::future::{join, join3};
use ruma::api::client::admin::{get_suspended, set_suspended}; use ruma::api::client::admin::{get_suspended, set_suspended};
use crate::Ruma; use crate::Ruma;
@ -12,13 +13,16 @@ pub(crate) async fn get_suspended_status(
body: Ruma<get_suspended::v1::Request>, body: Ruma<get_suspended::v1::Request>,
) -> Result<get_suspended::v1::Response> { ) -> Result<get_suspended::v1::Response> {
let sender_user = body.sender_user(); let sender_user = body.sender_user();
if !services.users.is_admin(sender_user).await {
let (admin, active) =
join(services.users.is_admin(sender_user), services.users.is_active(&body.user_id)).await;
if !admin {
return Err!(Request(Forbidden("Only server administrators can use this endpoint"))); return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
} }
if !services.globals.user_is_local(&body.user_id) { if !services.globals.user_is_local(&body.user_id) {
return Err!(Request(InvalidParam("Can only check the suspended status of local users"))); return Err!(Request(InvalidParam("Can only check the suspended status of local users")));
} }
if !services.users.is_active(&body.user_id).await { if !active {
return Err!(Request(NotFound("Unknown user"))); return Err!(Request(NotFound("Unknown user")));
} }
Ok(get_suspended::v1::Response::new( Ok(get_suspended::v1::Response::new(
@ -34,20 +38,28 @@ pub(crate) async fn put_suspended_status(
body: Ruma<set_suspended::v1::Request>, body: Ruma<set_suspended::v1::Request>,
) -> Result<set_suspended::v1::Response> { ) -> Result<set_suspended::v1::Response> {
let sender_user = body.sender_user(); let sender_user = body.sender_user();
if !services.users.is_admin(sender_user).await {
let (sender_admin, active, target_admin) = join3(
services.users.is_admin(sender_user),
services.users.is_active(&body.user_id),
services.users.is_admin(&body.user_id),
)
.await;
if !sender_admin {
return Err!(Request(Forbidden("Only server administrators can use this endpoint"))); return Err!(Request(Forbidden("Only server administrators can use this endpoint")));
} }
if !services.globals.user_is_local(&body.user_id) { if !services.globals.user_is_local(&body.user_id) {
return Err!(Request(InvalidParam("Can only set the suspended status of local users"))); return Err!(Request(InvalidParam("Can only set the suspended status of local users")));
} }
if !services.users.is_active(&body.user_id).await { if !active {
return Err!(Request(NotFound("Unknown user"))); return Err!(Request(NotFound("Unknown user")));
} }
if body.user_id == *sender_user { if body.user_id == *sender_user {
return Err!(Request(Forbidden("You cannot suspend yourself"))); return Err!(Request(Forbidden("You cannot suspend yourself")));
} }
if services.users.is_admin(&body.user_id).await { if target_admin {
return Err!(Request(Forbidden("You cannot suspend another admin"))); return Err!(Request(Forbidden("You cannot suspend another server administrator")));
} }
if services.users.is_suspended(&body.user_id).await? == body.suspended { if services.users.is_suspended(&body.user_id).await? == body.suspended {
// No change // No change