@@ -17,6 +17,7 @@ import {
1717 normalizeFromHandle ,
1818 normalizeInChannel ,
1919 parseSearchOperators ,
20+ type OperatorResolveResult ,
2021} from "@/features/search/lib/parseSearchOperators" ;
2122import type { SearchResult } from "@/features/search/ui/SearchResultItem" ;
2223import type { Channel , SearchHit , UserSearchResult } from "@/shared/api/types" ;
@@ -45,13 +46,13 @@ function resolveChannelIdFromOperator(
4546 raw : string | null ,
4647 channels : Channel [ ] ,
4748 channelLabels ?: Record < string , string > ,
48- ) : string | null {
49+ ) : OperatorResolveResult < string > {
4950 if ( ! raw ) {
50- return null ;
51+ return { status : "none" } ;
5152 }
5253 const value = normalizeInChannel ( raw ) ;
5354 if ( isChannelUuid ( value ) ) {
54- return value ;
55+ return { status : "resolved" , value } ;
5556 }
5657 const needle = value . toLowerCase ( ) ;
5758 const match = channels . find ( ( channel ) => {
@@ -60,28 +61,32 @@ function resolveChannelIdFromOperator(
6061 channel . name . toLowerCase ( ) === needle || label . toLowerCase ( ) === needle
6162 ) ;
6263 } ) ;
63- return match ?. id ?? null ;
64+ return match
65+ ? { status : "resolved" , value : match . id }
66+ : { status : "unresolved" } ;
6467}
6568
6669function resolveAuthorFromOperator (
6770 raw : string | null ,
6871 candidates : Array < { pubkey : string ; displayName ?: string | null } > ,
69- ) : string | null {
72+ ) : OperatorResolveResult < string > {
7073 if ( ! raw ) {
71- return null ;
74+ return { status : "none" } ;
7275 }
7376 if ( isHexPubkey ( raw ) ) {
74- return normalizePubkey ( raw ) ;
77+ return { status : "resolved" , value : normalizePubkey ( raw ) } ;
7578 }
7679 const handle = normalizeFromHandle ( raw ) . toLowerCase ( ) ;
7780 if ( ! handle ) {
78- return null ;
81+ return { status : "unresolved" } ;
7982 }
8083 const match = candidates . find ( ( candidate ) => {
8184 const name = candidate . displayName ?. trim ( ) . toLowerCase ( ) ;
8285 return name === handle || normalizePubkey ( candidate . pubkey ) === handle ;
8386 } ) ;
84- return match ? normalizePubkey ( match . pubkey ) : null ;
87+ return match
88+ ? { status : "resolved" , value : normalizePubkey ( match . pubkey ) }
89+ : { status : "unresolved" } ;
8590}
8691
8792export function useSearchResults ( {
@@ -110,9 +115,8 @@ export function useSearchResults({
110115 [ debouncedQuery ] ,
111116 ) ;
112117
113- const operatorChannelId = React . useMemo (
114- ( ) =>
115- resolveChannelIdFromOperator ( parsedQuery . in , channels , channelLabels ) ,
118+ const channelResolution = React . useMemo (
119+ ( ) => resolveChannelIdFromOperator ( parsedQuery . in , channels , channelLabels ) ,
116120 [ parsedQuery . in , channels , channelLabels ] ,
117121 ) ;
118122
@@ -127,45 +131,100 @@ export function useSearchResults({
127131
128132 const searchBackedQueriesEnabled = enabled && hasSearchQuery ;
129133
134+ const fromHandleForLookup =
135+ parsedQuery . from && ! isHexPubkey ( parsedQuery . from )
136+ ? normalizeFromHandle ( parsedQuery . from )
137+ : "" ;
138+
130139 const managedAgentsQuery = useManagedAgentsQuery ( {
131140 enabled : searchBackedQueriesEnabled ,
132141 } ) ;
133142 const relayAgentsQuery = useRelayAgentsQuery ( {
134143 enabled : searchBackedQueriesEnabled ,
135144 } ) ;
145+ // Resolve `from:@name` against people, not only agents.
146+ const fromUserSearchQuery = useUserSearchQuery ( fromHandleForLookup , {
147+ enabled : searchBackedQueriesEnabled && fromHandleForLookup . length >= 1 ,
148+ limit,
149+ } ) ;
150+ const userSearchQuery = useUserSearchQuery ( ftsQuery , {
151+ enabled : searchBackedQueriesEnabled ,
152+ limit,
153+ } ) ;
136154
137155 const authorCandidateSeed = React . useMemo ( ( ) => {
138156 const candidates : Array < { pubkey : string ; displayName ?: string | null } > =
139157 [ ] ;
158+ const seen = new Set < string > ( ) ;
159+ const push = ( pubkey : string , displayName ?: string | null ) => {
160+ const key = normalizePubkey ( pubkey ) ;
161+ if ( seen . has ( key ) ) {
162+ return ;
163+ }
164+ seen . add ( key ) ;
165+ candidates . push ( { pubkey : key , displayName } ) ;
166+ } ;
140167 for ( const agent of managedAgentsQuery . data ?? [ ] ) {
141- candidates . push ( { pubkey : agent . pubkey , displayName : agent . name } ) ;
168+ push ( agent . pubkey , agent . name ) ;
142169 }
143170 for ( const agent of relayAgentsQuery . data ?? [ ] ) {
144- candidates . push ( { pubkey : agent . pubkey , displayName : agent . name } ) ;
171+ push ( agent . pubkey , agent . name ) ;
172+ }
173+ for ( const user of fromUserSearchQuery . data ?? [ ] ) {
174+ push ( user . pubkey , user . displayName ) ;
175+ }
176+ for ( const user of userSearchQuery . data ?? [ ] ) {
177+ push ( user . pubkey , user . displayName ) ;
145178 }
146179 return candidates ;
147- } , [ managedAgentsQuery . data , relayAgentsQuery . data ] ) ;
180+ } , [
181+ managedAgentsQuery . data ,
182+ relayAgentsQuery . data ,
183+ fromUserSearchQuery . data ,
184+ userSearchQuery . data ,
185+ ] ) ;
148186
149- const resolvedAuthor = React . useMemo (
187+ const authorResolution = React . useMemo (
150188 ( ) => resolveAuthorFromOperator ( parsedQuery . from , authorCandidateSeed ) ,
151189 [ parsedQuery . from , authorCandidateSeed ] ,
152190 ) ;
153191
192+ const hasUnresolvedOperator =
193+ authorResolution . status === "unresolved" ||
194+ channelResolution . status === "unresolved" ;
195+
196+ // While `from:@name` user search is still loading, hold off so we do not
197+ // flash an unresolved empty state before candidates arrive.
198+ const waitingOnFromResolution =
199+ Boolean ( fromHandleForLookup ) &&
200+ fromUserSearchQuery . isLoading &&
201+ authorResolution . status === "unresolved" ;
202+
154203 const searchQuery = useSearchMessagesQuery ( ftsQuery , {
155- // Operators refine an FTS query. Empty FTS short-circuits on the relay
156- // search path, so require real search text (same floor as before).
157- enabled : enabled && ftsQuery . length >= MIN_SEARCH_QUERY_LENGTH ,
204+ enabled :
205+ enabled &&
206+ ! hasUnresolvedOperator &&
207+ ! waitingOnFromResolution &&
208+ ftsQuery . length >= MIN_SEARCH_QUERY_LENGTH ,
158209 limit,
159- channelId : operatorChannelId ?? undefined ,
160- authors : resolvedAuthor ? [ resolvedAuthor ] : undefined ,
210+ channelId :
211+ channelResolution . status === "resolved"
212+ ? channelResolution . value
213+ : undefined ,
214+ authors :
215+ authorResolution . status === "resolved"
216+ ? [ authorResolution . value ]
217+ : undefined ,
161218 since : parsedQuery . since ,
162219 until : parsedQuery . until ,
163220 } ) ;
164221
165- const messageResults = React . useMemo (
166- ( ) => dedupeSearchHits ( searchQuery . data ?. hits ?? [ ] ) ,
167- [ searchQuery . data ?. hits ] ,
168- ) ;
222+ const messageResults = React . useMemo ( ( ) => {
223+ if ( hasUnresolvedOperator && ! waitingOnFromResolution ) {
224+ return [ ] ;
225+ }
226+ return dedupeSearchHits ( searchQuery . data ?. hits ?? [ ] ) ;
227+ } , [ hasUnresolvedOperator , waitingOnFromResolution , searchQuery . data ?. hits ] ) ;
169228 const channelResults = React . useMemo ( ( ) => {
170229 if ( ftsQuery . length < MIN_SEARCH_QUERY_LENGTH ) {
171230 return [ ] ;
@@ -203,11 +262,6 @@ export function useSearchResults({
203262 } )
204263 . slice ( 0 , 5 ) ;
205264 } , [ channelLabels , channels , ftsQuery ] ) ;
206-
207- const userSearchQuery = useUserSearchQuery ( ftsQuery , {
208- enabled : searchBackedQueriesEnabled ,
209- limit,
210- } ) ;
211265 const managedAgentPubkeys = React . useMemo (
212266 ( ) =>
213267 new Set (
0 commit comments