mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2025-07-05 19:55:49 +02:00
parent
364293608d
commit
c06aa49a90
1 changed files with 4 additions and 6 deletions
|
@ -1,10 +1,7 @@
|
|||
use axum::extract::State;
|
||||
use conduwuit::{
|
||||
Result,
|
||||
utils::{
|
||||
future::BoolExt,
|
||||
stream::{BroadbandExt, ReadyExt},
|
||||
},
|
||||
utils::{future::BoolExt, stream::BroadbandExt},
|
||||
};
|
||||
use futures::{FutureExt, StreamExt, pin_mut};
|
||||
use ruma::{
|
||||
|
@ -37,17 +34,18 @@ pub(crate) async fn search_users_route(
|
|||
let mut users = services
|
||||
.users
|
||||
.stream()
|
||||
.ready_filter(|user_id| user_id.as_str().to_lowercase().contains(&search_term))
|
||||
.map(ToOwned::to_owned)
|
||||
.broad_filter_map(async |user_id| {
|
||||
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
|
||||
.as_deref()
|
||||
.map(str::to_lowercase)
|
||||
.is_some_and(|display_name| display_name.contains(&search_term));
|
||||
|
||||
if !display_name_matches {
|
||||
if !user_id_matches && !display_name_matches {
|
||||
return None;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue