git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-07-05 19:55:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix regression 75aadd5c6a

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-05-13 21:33:07 +00:00 • committed by Jade Ellis
parent 364293608d
commit c06aa49a90
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,7 @@
use axum::extract::State; use axum::extract::State;
use conduwuit::{ use conduwuit::{
Result, Result,
utils::{ utils::{future::BoolExt, stream::BroadbandExt},
future::BoolExt,
stream::{BroadbandExt, ReadyExt},
},
}; };
use futures::{FutureExt, StreamExt, pin_mut}; use futures::{FutureExt, StreamExt, pin_mut};
use ruma::{ use ruma::{
@ -37,17 +34,18 @@ pub(crate) async fn search_users_route(
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 display_name = services.users.displayname(&user_id).await.ok(); let display_name = services.users.displayname(&user_id).await.ok();
let user_id_matches = user_id.as_str().to_lowercase().contains(&search_term);
let display_name_matches = display_name let display_name_matches = display_name
.as_deref() .as_deref()
.map(str::to_lowercase) .map(str::to_lowercase)
.is_some_and(|display_name| display_name.contains(&search_term)); .is_some_and(|display_name| display_name.contains(&search_term));
if !display_name_matches { if !user_id_matches && !display_name_matches {
return None; return None;
} }