Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Fix errors in api/client/user_directory.rs

Browse Source
This commit is contained in:
Ginger
2026-04-12 11:15:44 -04:00
parent 698d959407
commit aa7c2ea1ad
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/client/user_directory.rs
+29 -31
View File
@@ -6,6 +6,7 @@ use conduwuit::{
use futures::{FutureExt, StreamExt, pin_mut}; use futures::{FutureExt, StreamExt, pin_mut};
use ruma::{ use ruma::{
api::client::user_directory::search_users::{self}, api::client::user_directory::search_users::{self},
assign,
events::room::join_rules::JoinRule, events::room::join_rules::JoinRule,
}; };
@@ -31,29 +32,25 @@ pub(crate) async fn search_users_route(
.min(LIMIT_MAX); .min(LIMIT_MAX);
let search_term = body.search_term.to_lowercase(); let search_term = body.search_term.to_lowercase();
let mut users = services let mut users = services.users.stream().broad_filter_map(async |user_id| {
.users let display_name = services.users.displayname(&user_id).await.ok();
.stream()
.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 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 !user_id_matches && !display_name_matches { if !user_id_matches && !display_name_matches {
return None; return None;
} }
let user_in_public_room = services let user_in_public_room =
services
.rooms .rooms
.state_cache .state_cache
.rooms_joined(&user_id) .rooms_joined(&user_id)
.map(ToOwned::to_owned)
.broad_any(async |room_id| { .broad_any(async |room_id| {
services services
.rooms .rooms
@@ -63,24 +60,25 @@ pub(crate) async fn search_users_route(
.await .await
}); });
let user_sees_user = services let user_sees_user = services
.rooms .rooms
.state_cache .state_cache
.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
.or(user_sees_user) if user_in_public_room.or(user_sees_user).await {
.await Some(assign!(search_users::v3::User::new(user_id.clone()), {
.then_some(search_users::v3::User { display_name,
user_id: user_id.clone(), avatar_url: services.users.avatar_url(&user_id).await.ok(),
display_name, }))
avatar_url: services.users.avatar_url(&user_id).await.ok(), } else {
}) None
}); }
});
let results = users.by_ref().take(limit).collect().await; let results = users.by_ref().take(limit).collect().await;
let limited = users.next().await.is_some(); let limited = users.next().await.is_some();
Ok(search_users::v3::Response { results, limited }) Ok(search_users::v3::Response::new(results, limited))
} }