From 69288fef30fc1c12f799e0619a2d5fcfc86e7b47 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 13 May 2025 21:33:07 +0000
Subject: [PATCH] Fix regression 75aadd5c6a

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/api/client/user_directory.rs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/api/client/user_directory.rs b/src/api/client/user_directory.rs
index c0119f2b..43200a2f 100644
--- a/src/api/client/user_directory.rs
+++ b/src/api/client/user_directory.rs
@@ -6,10 +6,7 @@ use ruma::{
 };
 use tuwunel_core::{
 	Result,
-	utils::{
-		future::BoolExt,
-		stream::{BroadbandExt, ReadyExt},
-	},
+	utils::{future::BoolExt, stream::BroadbandExt},
 };
 
 use crate::Ruma;
@@ -37,22 +34,21 @@ 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;
 			}