Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
collab: Route `fuzzy_search_users` through Cloud (#56436)
Marshall Bowers7472c29de0b6
diff --git a/crates/cloud_api_types/src/internal_api.rs b/crates/cloud_api_types/src/internal_api.rsindex ad3b4557fc0..2beda5665a4 100644--- a/crates/cloud_api_types/src/internal_api.rs+++ b/crates/cloud_api_types/src/internal_api.rs@@ -30,3 +30,14 @@ pub struct LookUpUserByGithubLoginBody {pub struct LookUpUserByGithubLoginResponse {pub user: Option<User>,}++#[derive(Debug, Serialize, Deserialize)]+pub struct FuzzySearchUsersBody {+ pub query: String,+ pub limit: u32,+}++#[derive(Debug, Serialize, Deserialize)]+pub struct FuzzySearchUsersResponse {+ pub users: Vec<User>,+}diff --git a/crates/collab/src/services/user_service.rs b/crates/collab/src/services/user_service.rsindex 1f589213d51..becb6dc25c5 100644--- a/crates/collab/src/services/user_service.rs+++ b/crates/collab/src/services/user_service.rs@@ -3,8 +3,8 @@ use std::sync::Arc;use anyhow::{Context as _, anyhow};use async_trait::async_trait;use cloud_api_types::internal_api::{- self, LookUpUserByGithubLoginBody, LookUpUserByGithubLoginResponse, LookUpUsersByLegacyIdBody,- LookUpUsersByLegacyIdResponse,+ self, FuzzySearchUsersBody, FuzzySearchUsersResponse, LookUpUserByGithubLoginBody,+ LookUpUserByGithubLoginResponse, LookUpUsersByLegacyIdBody, LookUpUsersByLegacyIdResponse,};use reqwest::RequestBuilder;use rpc::proto;@@ -74,7 +74,7 @@ impl UserService for TransitionalUserService {}async fn fuzzy_search_users(&self, query: &str, limit: u32) -> Result<Vec<User>> {- self.database_user_service+ self.cloud_user_service.fuzzy_search_users(query, limit).await}@@ -182,10 +182,21 @@ impl UserService for CloudUserService {}async fn fuzzy_search_users(&self, query: &str, limit: u32) -> Result<Vec<User>> {- let _ = query;- let _ = limit;+ let response_body: FuzzySearchUsersResponse = self+ .send_request(+ self.http_client+ .post(format!(+ "{}/internal/users/fuzzy_search",+ &self.zed_cloud_url+ ))+ .json(&FuzzySearchUsersBody {+ query: query.to_string(),+ limit,+ }),+ )+ .await?;- unimplemented!("not yet implemented in Cloud")+ Ok(response_body.users.into_iter().map(User::from).collect())}async fn search_channel_members(