Update search

lucemans · lucemans · commit 8b9614ac9a73 · 2025-03-21T18:36:23.000+01:00
diff --git a/packages/app/src/discovery/engine.rs b/packages/app/src/discovery/engine.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use axum::async_trait;
 use enstate_shared::core::lookup_data::LookupInfo;
 use enstate_shared::core::{ENSService, Profile};
-use enstate_shared::discovery::Discovery;
+use enstate_shared::discovery::{Discovery, SearchResult};
 use ethers::providers::namehash;
 use futures::future::join_all;
 use serde::{Deserialize, Serialize};
@@ -106,7 +106,7 @@ impl Discovery for DiscoveryEngine {
         }
     }
 
-    async fn query_search(&self, service: &ENSService, query: String) -> Result<Vec<Profile>, ()> {
+    async fn query_search(&self, service: &ENSService, query: String) -> Result<Vec<SearchResult>, ()> {
         let index = self.client.index("profiles");
         
         // Create search with query and limit to 12 results
@@ -124,20 +124,14 @@ impl Discovery for DiscoveryEngine {
                 if search_results.hits.is_empty() {
                     return Ok(vec![]);
                 }
-                
+
                 // Extract the name for each result to use with resolve_name
-                let names: Vec<String> = search_results.hits
+                let names: Vec<SearchResult> = search_results.hits
                     .into_iter()
-                    .map(|hit| hit.result.name)
+                    .map(|hit| SearchResult { name: hit.result.name })
                     .collect();
-                
-                let profiles = names.into_iter().map(|name| async move {
-                    service.resolve_profile(LookupInfo::Name(name), false).await.unwrap()
-                }).collect::<Vec<_>>();
-
-                let profiles = join_all(profiles).await;
 
-                Ok(profiles)
+                Ok(names)
             },
             Err(e) => {
                 tracing::error!("Error searching profiles: {}", e);
diff --git a/packages/app/src/routes/v2/mod.rs b/packages/app/src/routes/v2/mod.rs
@@ -14,7 +14,7 @@ use enstate_shared::core::lookup_data::LookupInfo;
 use enstate_shared::core::Profile;
 use ethers_core::types::Address;
 use futures::future::join_all;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use tokio_stream::wrappers::UnboundedReceiverStream;
 use tracing::info;
 
@@ -36,6 +36,11 @@ pub struct SearchQuery {
     s: String,
 }
 
+#[derive(Serialize, Deserialize)]
+pub struct ProfileSearchResult {
+    pub name: String,
+}
+
 /// /a/{address}
 ///
 /// Here is an example of a valid request that looks up an address:
@@ -59,13 +64,13 @@ pub struct SearchQuery {
 pub async fn discovery_search(
     Query(query): Query<SearchQuery>,
     State(state): State<Arc<crate::AppState>>,
-) -> Result<Json<Vec<Profile>>, RouteError> {
+) -> Result<Json<Vec<ProfileSearchResult>>, RouteError> {
 
     info!("query: {:?}", query.s);
     
     if let Some(discovery) = &state.service.discovery {
         let profiles = discovery.query_search(&state.service, query.s).await.unwrap();
-        return Ok(Json(profiles));
+        return Ok(Json(profiles.into_iter().map(|x| ProfileSearchResult { name: x.name }).collect()));
     }
     // get_bulk(
     //     Qs(AddressGetBulkQuery {
diff --git a/packages/search/src/components/SearchResult.tsx b/packages/search/src/components/SearchResult.tsx
@@ -3,6 +3,8 @@ import { LuMapPin, LuMail, LuGlobe, LuTwitter, LuGithub, LuMessageSquare, LuSend
 import { ChainIcon } from './ChainIcon';
 import { getChainIconUrl } from '../utils/chainIcons';
 import { useFollowers } from '../hooks/useFollowers';
+import { ProfileSearchResult } from '@/hooks/useSearch';
+import { useProfile } from '@/hooks/useProfile';
 
 interface Profile {
   name: string;
@@ -26,11 +28,12 @@ interface Profile {
 }
 
 interface SearchResultProps {
-  profile: Profile;
+  profile: ProfileSearchResult;
 }
 
 export function SearchResult({ profile }: SearchResultProps) {
   const { data: followersData } = useFollowers(profile.name);
+  const { data: profileData } = useProfile(profile.name);
 
   return (
     <div className="bg-white rounded-lg overflow-hidden shadow-sm hover:shadow-md transition-all duration-200">
@@ -41,11 +44,11 @@ export function SearchResult({ profile }: SearchResultProps) {
       >
         <div className="relative h-full flex flex-col">
           {/* Header/Banner image */}
-          {profile.header || profile.records?.header ? (
+          {profileData?.header || profileData?.records?.header ? (
             <div className="w-full aspect-[3/1] overflow-hidden">
               <img
-                src={profile.header || profile.records?.header}
-                alt={`${profile.display} banner`}
+                src={profileData.header || profileData.records?.header}
+                alt={`${profileData.display} banner`}
                 className="w-full h-full object-cover"
               />
             </div>
@@ -57,38 +60,38 @@ export function SearchResult({ profile }: SearchResultProps) {
           <div className="p-2 flex-1">
             <div className="flex items-start space-x-2 pr-2 pb-1 h-full">
               {/* Avatar */}
-              <div className={`${profile.header || profile.records?.header ? '-mt-7' : ''} flex-shrink-0`}>
-                {profile.avatar ? (
+              <div className={`${profileData?.header || profileData?.records?.header ? '-mt-7' : ''} flex-shrink-0`}>
+                {profileData?.avatar ? (
                   <img
-                    src={profile.avatar}
-                    alt={profile.display}
+                    src={profileData.avatar}
+                    alt={profileData.display}
                     className="h-14 w-14 rounded-full border-2 border-white shadow-md object-cover"
                   />
                 ) : (
                   <div className="h-14 w-14 rounded-full bg-gray-200 flex items-center justify-center text-gray-500 text-xl font-bold">
-                    {profile.display.charAt(0).toUpperCase()}
+                    {profileData?.display?.charAt(0).toUpperCase()}
                   </div>
                 )}
               </div>
 
               {/* Profile details */}
               <div className="flex-1 min-w-0 h-full flex flex-col">
                 <h3 className="text-base font-semibold text-blue-600 truncate">
-                  {profile.display}
+                  {profileData?.display}
                 </h3>
-                {profile.address && (
+                {profileData?.address && (
                   <p className="text-xs text-gray-500 truncate">
-                    {profile.address}
+                    {profileData.address}
                   </p>
                 )}
                 <p className="mt-1 text-xs text-gray-600 whitespace-pre-line line-clamp-2">
-                  {profile.records?.description || ''}
+                  {profileData?.records?.description || ''}
                 </p>
 
                 {/* Chain addresses */}
-                {profile.chains && Object.keys(profile.chains).length > 0 && (
+                {profileData?.chains && Object.keys(profileData.chains).length > 0 && (
                   <div className="mt-1.5 flex flex-wrap gap-x-2 gap-y-1">
-                    {Object.entries(profile.chains).map(([chain, address]) => (
+                    {Object.entries(profileData.chains).map(([chain, address]) => (
                       <div key={chain} className="flex items-center text-xs text-gray-500" title={`${chain.toUpperCase()}: ${address}`}>
                         <ChainIcon
                           chain={chain}
@@ -103,47 +106,47 @@ export function SearchResult({ profile }: SearchResultProps) {
 
                 {/* Profile metadata */}
                 <div className="mt-1.5 flex flex-wrap gap-x-3 gap-y-1 text-xs text-gray-500">
-                  {profile.records?.location && (
+                  {profileData?.records?.location && (
                     <div className="flex items-center">
                       <LuMapPin className="mr-1 h-4 w-4" />
-                      <span>{profile.records.location}</span>
+                      <span>{profileData.records.location}</span>
                     </div>
                   )}
-                  {profile.records?.email && (
+                  {profileData?.records?.email && (
                     <div className="flex items-center">
                       <LuMail className="mr-1 h-4 w-4" />
-                      <span>{profile.records.email}</span>
+                      <span>{profileData.records.email}</span>
                     </div>
                   )}
-                  {profile.records?.url && (
+                  {profileData?.records?.url && (
                     <div className="flex items-center">
                       <LuGlobe className="mr-1 h-4 w-4" />
-                      <span>{profile.records.url}</span>
+                      <span>{profileData.records.url}</span>
                     </div>
                   )}
                 </div>
 
                 {/* Social links and followers */}
                 <div className="mt-1.5 flex justify-between items-center flex-1">
                   <div className="flex space-x-2">
-                    {profile.records?.['com.twitter'] && (
+                    {profileData?.records?.['com.twitter'] && (
                       <div className="text-blue-400 hover:text-blue-600">
-                        <LuTwitter className="h-4 w-4" title={`Twitter: ${profile.records['com.twitter']}`} />
+                        <LuTwitter className="h-4 w-4" title={`Twitter: ${profileData.records['com.twitter']}`} />
                       </div>
                     )}
-                    {profile.records?.['com.github'] && (
+                    {profileData?.records?.['com.github'] && (
                       <div className="text-gray-700 hover:text-gray-900">
-                        <LuGithub className="h-4 w-4" title={`GitHub: ${profile.records['com.github']}`} />
+                        <LuGithub className="h-4 w-4" title={`GitHub: ${profileData.records['com.github']}`} />
                       </div>
                     )}
-                    {profile.records?.['com.discord'] && (
+                    {profileData?.records?.['com.discord'] && (
                       <div className="text-indigo-500 hover:text-indigo-700">
-                        <LuMessageSquare className="h-4 w-4" title={`Discord: ${profile.records['com.discord']}`} />
+                        <LuMessageSquare className="h-4 w-4" title={`Discord: ${profileData.records['com.discord']}`} />
                       </div>
                     )}
-                    {profile.records?.['org.telegram'] && (
+                    {profileData?.records?.['org.telegram'] && (
                       <div className="text-blue-500 hover:text-blue-700">
-                        <LuSend className="h-4 w-4" title={`Telegram: ${profile.records['org.telegram']}`} />
+                        <LuSend className="h-4 w-4" title={`Telegram: ${profileData.records['org.telegram']}`} />
                       </div>
                     )}
                   </div>
diff --git a/packages/search/src/hooks/useProfile.ts b/packages/search/src/hooks/useProfile.ts
@@ -1,8 +1,8 @@
 import { useQuery } from '@tanstack/react-query';
-import { SearchResult } from './useSearch';
+import { ProfileSearchResult } from './useSearch';
 
 // We'll use the same interface as SearchResult for consistency
-export type Profile = SearchResult;
+export type Profile = ProfileSearchResult;
 
 import { profileFetcher } from 'use-enstate/helpers';
 
@@ -28,4 +28,4 @@ export const useProfile = (profileId: string) => {
     enabled: Boolean(profileId),
     staleTime: 1000 * 60 * 5, // 5 minutes
   });
-}; 
+};
diff --git a/packages/search/src/hooks/useSearch.ts b/packages/search/src/hooks/useSearch.ts
@@ -1,46 +1,20 @@
 import { useQuery } from '@tanstack/react-query';
 import axios from 'axios';
 
-export interface SearchResult {
+export interface ProfileSearchResult {
   name: string;
-  address: string;
-  avatar?: string;
-  header?: string;
-  display: string;
-  contenthash?: string;
-  records?: {
-    avatar?: string;
-    description?: string;
-    email?: string;
-    name?: string;
-    url?: string;
-    location?: string;
-    'com.discord'?: string;
-    'com.github'?: string;
-    'com.twitter'?: string;
-    'org.telegram'?: string;
-    header?: string;
-    timezone?: string;
-    pronouns?: string;
-    [key: string]: string | undefined;
-  };
-  chains?: Record<string, string>;
-  fresh?: number;
-  resolver?: string;
-  ccip_urls?: string[];
-  errors?: Record<string, any>;
 }
 
 export const useSearch = (searchTerm: string) => {
   return useQuery({
     queryKey: ['search', searchTerm],
     queryFn: async () => {
       if (!searchTerm.trim()) {
-        return [] as SearchResult[];
+        return [] as ProfileSearchResult[];
       }
-      
+
       const apiUrl = import.meta.env.VITE_API_URL || 'http://localhost:3000';
-      const response = await axios.get<SearchResult[]>(
+      const response = await axios.get<ProfileSearchResult[]>(
         `${apiUrl}/v2/discover/search?s=${encodeURIComponent(searchTerm)}`
       );
       
diff --git a/packages/shared/src/discovery/mod.rs b/packages/shared/src/discovery/mod.rs
@@ -1,10 +1,14 @@
 use crate::core::{ENSService, Profile};
 use async_trait::async_trait;
 
+pub struct SearchResult {
+    pub name: String,
+}
+
 #[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
 #[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 pub trait Discovery: Send + Sync {
     async fn discover_name(&self, profile: &Profile) -> Result<(), ()>;
 
-    async fn query_search(&self, service: &ENSService, query: String) -> Result<Vec<Profile>, ()>;
+    async fn query_search(&self, service: &ENSService, query: String) -> Result<Vec<SearchResult>, ()>;
 }
