1- use nostr:: PublicKey ;
2-
31use crate :: client:: { normalize_write_response, BuzzClient } ;
42use crate :: error:: CliError ;
53use crate :: validate:: validate_hex64;
@@ -15,7 +13,6 @@ pub async fn cmd_get_users(
1513 client : & BuzzClient ,
1614 pubkeys : & [ String ] ,
1715 name : Option < & str > ,
18- owner : Option < & str > ,
1916 format : & crate :: OutputFormat ,
2017) -> Result < ( ) , CliError > {
2118 if let Some ( query) = name {
@@ -24,7 +21,7 @@ pub async fn cmd_get_users(
2421 "--name and --pubkey are mutually exclusive" . into ( ) ,
2522 ) ) ;
2623 }
27- return search_by_name ( client, query, owner , format) . await ;
24+ return search_by_name ( client, query, format) . await ;
2825 }
2926
3027 for pk in pubkeys {
@@ -41,18 +38,12 @@ pub async fn cmd_get_users(
4138 pubkeys. iter ( ) . map ( |s| s. as_str ( ) ) . collect ( )
4239 } ;
4340
44- let owner = resolve_owner ( client, owner) ?;
4541 let filter = serde_json:: json!( {
4642 "kinds" : [ 0 ] ,
4743 "authors" : authors,
48- "limit" : authors. len( ) ,
49- "include_agent_owner" : true ,
50- "agent_owner" : owner,
44+ "limit" : authors. len( )
5145 } ) ;
5246 let resp = client. query ( & filter) . await ?;
53- let my_owner_pubkey = client
54- . auth_tag_owner_hex ( )
55- . unwrap_or_else ( || client. keys ( ) . public_key ( ) . to_hex ( ) ) ;
5647 let events: Vec < serde_json:: Value > = serde_json:: from_str ( & resp) . unwrap_or_default ( ) ;
5748 let profiles: Vec < serde_json:: Value > = events
5849 . iter ( )
@@ -64,7 +55,6 @@ pub async fn cmd_get_users(
6455 "pubkey" . to_string ( ) ,
6556 serde_json:: json!( e. get( "pubkey" ) . and_then( |v| v. as_str( ) ) . unwrap_or( "" ) ) ,
6657 ) ;
67- copy_owner_fields ( e, obj, & my_owner_pubkey) ;
6858 }
6959 Some ( profile)
7060 } )
@@ -76,9 +66,6 @@ pub async fn cmd_get_users(
7666 . map ( |p| serde_json:: json!( {
7767 "pubkey" : p. get( "pubkey" ) . cloned( ) . unwrap_or_default( ) ,
7868 "display_name" : p. get( "display_name" ) . or_else( || p. get( "name" ) ) . cloned( ) . unwrap_or_default( ) ,
79- "owner_pubkey" : p. get( "owner_pubkey" ) . cloned( ) . unwrap_or_default( ) ,
80- "owner_display_name" : p. get( "owner_display_name" ) . cloned( ) . unwrap_or_default( ) ,
81- "owned_by_me" : p. get( "owned_by_me" ) . cloned( ) . unwrap_or_default( ) ,
8269 } ) )
8370 . collect ( ) ;
8471 serde_json:: to_string ( & compact) . unwrap_or_default ( )
@@ -89,70 +76,23 @@ pub async fn cmd_get_users(
8976 Ok ( ( ) )
9077}
9178
92- fn copy_owner_fields (
93- event : & serde_json:: Value ,
94- profile : & mut serde_json:: Map < String , serde_json:: Value > ,
95- my_owner_pubkey : & str ,
96- ) {
97- if let Some ( value) = event. get ( "agent_owner_pubkey" ) {
98- profile. insert ( "owner_pubkey" . to_string ( ) , value. clone ( ) ) ;
99- }
100- if let Some ( value) = event. get ( "agent_owner_display_name" ) {
101- profile. insert ( "owner_display_name" . to_string ( ) , value. clone ( ) ) ;
102- }
103- if let Some ( owner) = event
104- . get ( "agent_owner_pubkey" )
105- . and_then ( |value| value. as_str ( ) )
106- {
107- profile. insert (
108- "owned_by_me" . to_string ( ) ,
109- serde_json:: json!( owner == my_owner_pubkey) ,
110- ) ;
111- }
112- }
113-
114- fn resolve_owner ( client : & BuzzClient , owner : Option < & str > ) -> Result < Option < String > , CliError > {
115- owner
116- . map ( |owner| {
117- if owner == "me" {
118- Ok ( client
119- . auth_tag_owner_hex ( )
120- . unwrap_or_else ( || client. keys ( ) . public_key ( ) . to_hex ( ) ) )
121- } else {
122- PublicKey :: parse ( owner)
123- . map ( |pubkey| pubkey. to_hex ( ) )
124- . map_err ( |e| {
125- CliError :: Usage ( format ! ( "--owner must be `me`, a pubkey, or npub: {e}" ) )
126- } )
127- }
128- } )
129- . transpose ( )
130- }
131-
13279/// Search for users by display name via NIP-50 full-text search on kind:0 profiles.
13380/// Returns [] if the relay does not implement NIP-50 search.
13481async fn search_by_name (
13582 client : & BuzzClient ,
13683 query : & str ,
137- owner : Option < & str > ,
13884 format : & crate :: OutputFormat ,
13985) -> Result < ( ) , CliError > {
14086 if query. trim ( ) . is_empty ( ) {
14187 return Err ( CliError :: Usage ( "--name cannot be empty" . into ( ) ) ) ;
14288 }
14389
144- let owner = resolve_owner ( client, owner) ?;
14590 let filter = serde_json:: json!( {
14691 "kinds" : [ 0 ] ,
14792 "search" : query,
148- "limit" : 100 ,
149- "include_agent_owner" : true ,
150- "agent_owner" : owner,
93+ "limit" : 100
15194 } ) ;
15295 let raw = client. query ( & filter) . await ?;
153- let my_owner_pubkey = client
154- . auth_tag_owner_hex ( )
155- . unwrap_or_else ( || client. keys ( ) . public_key ( ) . to_hex ( ) ) ;
15696
15797 // Parse and filter client-side for case-insensitive substring match
15898 // on display_name or name fields (NIP-50 may return broader matches).
@@ -186,7 +126,6 @@ async fn search_by_name(
186126 "pubkey" . to_string ( ) ,
187127 serde_json:: json!( event. get( "pubkey" ) . and_then( |v| v. as_str( ) ) . unwrap_or( "" ) ) ,
188128 ) ;
189- copy_owner_fields ( event, obj, & my_owner_pubkey) ;
190129 }
191130 Some ( profile)
192131 } )
@@ -198,9 +137,6 @@ async fn search_by_name(
198137 . map ( |p| serde_json:: json!( {
199138 "pubkey" : p. get( "pubkey" ) . cloned( ) . unwrap_or_default( ) ,
200139 "display_name" : p. get( "display_name" ) . or_else( || p. get( "name" ) ) . cloned( ) . unwrap_or_default( ) ,
201- "owner_pubkey" : p. get( "owner_pubkey" ) . cloned( ) . unwrap_or_default( ) ,
202- "owner_display_name" : p. get( "owner_display_name" ) . cloned( ) . unwrap_or_default( ) ,
203- "owned_by_me" : p. get( "owned_by_me" ) . cloned( ) . unwrap_or_default( ) ,
204140 } ) )
205141 . collect ( ) ;
206142 serde_json:: to_string ( & compact) . unwrap_or_default ( )
@@ -375,11 +311,9 @@ pub async fn dispatch(
375311) -> Result < ( ) , CliError > {
376312 use crate :: UsersCmd ;
377313 match cmd {
378- UsersCmd :: Get {
379- pubkeys,
380- name,
381- owner,
382- } => cmd_get_users ( client, & pubkeys, name. as_deref ( ) , owner. as_deref ( ) , format) . await ,
314+ UsersCmd :: Get { pubkeys, name } => {
315+ cmd_get_users ( client, & pubkeys, name. as_deref ( ) , format) . await
316+ }
383317 UsersCmd :: SetProfile {
384318 name,
385319 avatar,
@@ -402,30 +336,9 @@ pub async fn dispatch(
402336
403337#[ cfg( test) ]
404338mod tests {
405- use super :: { copy_owner_fields , presence_subject} ;
339+ use super :: presence_subject;
406340 use serde_json:: json;
407341
408- #[ test]
409- fn copy_owner_fields_marks_authenticated_owner ( ) {
410- let owner = "a" . repeat ( 64 ) ;
411- let event = json ! ( {
412- "agent_owner_pubkey" : owner,
413- "agent_owner_display_name" : "John" ,
414- } ) ;
415- let mut profile = serde_json:: Map :: new ( ) ;
416- copy_owner_fields ( & event, & mut profile, & "a" . repeat ( 64 ) ) ;
417- assert_eq ! ( profile[ "owner_display_name" ] , "John" ) ;
418- assert_eq ! ( profile[ "owned_by_me" ] , true ) ;
419- }
420-
421- #[ test]
422- fn copy_owner_fields_marks_other_owner ( ) {
423- let event = json ! ( { "agent_owner_pubkey" : "a" . repeat( 64 ) } ) ;
424- let mut profile = serde_json:: Map :: new ( ) ;
425- copy_owner_fields ( & event, & mut profile, & "b" . repeat ( 64 ) ) ;
426- assert_eq ! ( profile[ "owned_by_me" ] , false ) ;
427- }
428-
429342 #[ test]
430343 fn presence_subject_uses_p_tag ( ) {
431344 let event = json ! ( { "pubkey" : "relay" , "tags" : [ [ "p" , "user" ] ] } ) ;
0 commit comments