magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slightly optimize user directory search loop

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-04-06 22:50:01 +00:00 • committed by Jade Ellis
parent e8a64bb59d
commit eac713a2a9
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
1 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/api/client/user_directory.rs
View file

@ -1,7 +1,10 @@
use axum::extract::State; use axum::extract::State;
use conduwuit::{ use conduwuit::{
Result, Result,
utils::{future::BoolExt, stream::BroadbandExt}, utils::{
future::BoolExt,
stream::{BroadbandExt, ReadyExt},
},
}; };
use futures::{FutureExt, StreamExt, pin_mut}; use futures::{FutureExt, StreamExt, pin_mut};
use ruma::{ use ruma::{
@ -30,29 +33,21 @@ pub(crate) async fn search_users_route(
.map_or(LIMIT_DEFAULT, usize::from) .map_or(LIMIT_DEFAULT, usize::from)
.min(LIMIT_MAX); .min(LIMIT_MAX);
let search_term = body.search_term.to_lowercase();
let mut users = services let mut users = services
.users .users
.stream() .stream()
.ready_filter(|user_id| user_id.as_str().to_lowercase().contains(&search_term))
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.broad_filter_map(async |user_id| { .broad_filter_map(async |user_id| {
let user = search_users::v3::User { let display_name = services.users.displayname(&user_id).await.ok();
user_id: user_id.clone(),
display_name: services.users.displayname(&user_id).await.ok(),
avatar_url: services.users.avatar_url(&user_id).await.ok(),
};
let user_id_matches = user let display_name_matches = display_name
.user_id .as_deref()
.as_str() .map(str::to_lowercase)
.to_lowercase() .is_some_and(|display_name| display_name.contains(&search_term));
.contains(&body.search_term.to_lowercase());
let user_displayname_matches = user.display_name.as_ref().is_some_and(|name| { if !display_name_matches {
name.to_lowercase()
.contains(&body.search_term.to_lowercase())
});
if !user_id_matches && !user_displayname_matches {
return None; return None;
} }
@ -61,11 +56,11 @@ pub(crate) async fn search_users_route(
.state_cache .state_cache
.rooms_joined(&user_id) .rooms_joined(&user_id)
.map(ToOwned::to_owned) .map(ToOwned::to_owned)
.any(|room| async move { .broad_any(async |room_id| {
services services
.rooms .rooms
.state_accessor .state_accessor
.get_join_rules(&room) .get_join_rules(&room_id)
.map(|rule| matches!(rule, JoinRule::Public)) .map(|rule| matches!(rule, JoinRule::Public))
.await .await
}); });
@ -76,8 +71,14 @@ pub(crate) async fn search_users_route(
.user_sees_user(sender_user, &user_id); .user_sees_user(sender_user, &user_id);
pin_mut!(user_in_public_room, user_sees_user); pin_mut!(user_in_public_room, user_sees_user);
user_in_public_room
user_in_public_room.or(user_sees_user).await.then_some(user) .or(user_sees_user)
.await
.then_some(search_users::v3::User {
user_id: user_id.clone(),
display_name,
avatar_url: services.users.avatar_url(&user_id).await.ok(),
})
}); });
let results = users.by_ref().take(limit).collect().await; let results = users.by_ref().take(limit).collect().await;