A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(admin): batch user id lookups on the users page (#2547)
Hampus8dcd00a8fe05
diff --git a/fluxer_admin/src/routes/users.rs b/fluxer_admin/src/routes/users.rsindex 76a508e28..5f91705b0 100644--- a/fluxer_admin/src/routes/users.rs+++ b/fluxer_admin/src/routes/users.rs@@ -2,7 +2,10 @@use crate::{acl,- api::client::{AdminApiClient, ApiResultExt},+ api::{+ client::{AdminApiClient, ApiResult, ApiResultExt},+ types::AdminUser,+ },middleware::{auth::AuthContext, csrf::CsrfToken, flash, htmx},routes::user_tabs,state::AppState,@@ -18,6 +21,8 @@ use axum::{};use serde::Deserialize;+const USER_ID_LOOKUP_BATCH: usize = 100;+#[derive(Deserialize)]struct UserListQuery {q: Option<String>,@@ -83,14 +88,10 @@ async fn users_list(let can_view_email = acl::has_permission(admin_acls, acl::USER_VIEW_EMAIL);let client = AdminApiClient::new(state.http_client(), config, &auth.0.session);let results = if params.has_id_lookup() {- let users = client- .lookup_users_by_ids(¶ms.requested_ids)+ lookup_users_in_batches(&client, ¶ms.requested_ids).await- .map_err(- |error| tracing::warn!(%error, "admin API request failed: lookup users by ids"),- )- .unwrap_or_default();- Some((users, false))+ .log_error("lookup users by ids")+ .map(|users| (users, false))} else if params.has_search() {let offset = params.page.saturating_mul(params.limit);client@@ -124,6 +125,17 @@ async fn users_list(Html(markup.into_string()).into_response()}+async fn lookup_users_in_batches(+ client: &AdminApiClient,+ user_ids: &[String],+) -> ApiResult<Vec<AdminUser>> {+ let mut users = Vec::new();+ for batch in user_ids.chunks(USER_ID_LOOKUP_BATCH) {+ users.extend(client.lookup_users_by_ids(batch).await?);+ }+ Ok(users)+}+async fn user_detail(State(state): State<AppState>,headers: HeaderMap,