@@ -86,6 +86,15 @@ async fn resolve_thread_ref(
8686/// Resolve the channel UUID for an event by querying for it via POST /query.
8787/// Extracts the `h` tag value from the returned event's tags.
8888async fn resolve_channel_id ( client : & BuzzClient , event_id : & str ) -> Result < Uuid , CliError > {
89+ let event = fetch_event_by_id ( client, event_id) . await ?;
90+ channel_id_from_event ( & event, event_id)
91+ }
92+
93+ /// Fetch a single event by its ID via POST /query.
94+ async fn fetch_event_by_id (
95+ client : & BuzzClient ,
96+ event_id : & str ,
97+ ) -> Result < serde_json:: Value , CliError > {
8998 let filter = serde_json:: json!( {
9099 "ids" : [ event_id]
91100 } ) ;
@@ -95,9 +104,13 @@ async fn resolve_channel_id(client: &BuzzClient, event_id: &str) -> Result<Uuid,
95104 let arr = events
96105 . as_array ( )
97106 . ok_or_else ( || CliError :: Other ( "query response is not an array" . into ( ) ) ) ?;
98- let event = arr
99- . first ( )
100- . ok_or_else ( || CliError :: Other ( format ! ( "event {event_id} not found" ) ) ) ?;
107+ arr. first ( )
108+ . cloned ( )
109+ . ok_or_else ( || CliError :: Other ( format ! ( "event {event_id} not found" ) ) )
110+ }
111+
112+ /// Extract the channel UUID from an event's h-tag.
113+ fn channel_id_from_event ( event : & serde_json:: Value , event_id : & str ) -> Result < Uuid , CliError > {
101114 let tags = event
102115 . get ( "tags" )
103116 . and_then ( |t| t. as_array ( ) )
@@ -149,6 +162,27 @@ fn resolve_names_to_pubkeys(
149162 Ok ( resolved)
150163}
151164
165+ /// Extract raw `imeta` tag vectors from a fetched event's JSON tags.
166+ /// Only `imeta` tags are returned — no other tag kinds are carried.
167+ fn extract_imeta_tags ( event : & serde_json:: Value ) -> Vec < Vec < String > > {
168+ event
169+ . get ( "tags" )
170+ . and_then ( |t| t. as_array ( ) )
171+ . map ( |tags| {
172+ tags. iter ( )
173+ . filter_map ( |t| t. as_array ( ) )
174+ . filter ( |parts| parts. first ( ) . and_then ( |v| v. as_str ( ) ) == Some ( "imeta" ) )
175+ . map ( |parts| {
176+ parts
177+ . iter ( )
178+ . filter_map ( |v| v. as_str ( ) . map ( String :: from) )
179+ . collect ( )
180+ } )
181+ . collect ( )
182+ } )
183+ . unwrap_or_default ( )
184+ }
185+
152186/// Resolve mention text against the channel membership snapshot.
153187///
154188/// Returns both the current member set and uniquely name-resolved pubkeys.
@@ -812,19 +846,61 @@ pub async fn cmd_delete_message(
812846}
813847
814848/// Edit a message you previously sent.
849+ ///
850+ /// Attachment semantics:
851+ /// - No `--file` and no `--no-media`: preserves existing attachments (default carry-forward)
852+ /// - `--file` provided: replaces attachments with the uploaded file(s) and appends markdown
853+ /// - `--no-media`: removes all attachments from the message
815854pub async fn cmd_edit_message (
816855 client : & BuzzClient ,
817856 event_id : & str ,
818857 content : & str ,
858+ files : & [ String ] ,
859+ no_media : bool ,
819860) -> Result < ( ) , CliError > {
820861 validate_hex64 ( event_id) ?;
821862 validate_content_size ( content) ?;
822863
823- // Resolve channel_id from the event's h-tag
824- let channel_uuid = resolve_channel_id ( client, event_id) . await ?;
864+ // Fetch the target event once; derive both the channel id and the
865+ // carry-forward attachment set from that single query.
866+ let target_event = fetch_event_by_id ( client, event_id) . await ?;
867+ let channel_uuid = channel_id_from_event ( & target_event, event_id) ?;
825868 let target_eid = parse_event_id ( event_id) ?;
826869
827- let builder = buzz_sdk:: build_edit ( channel_uuid, target_eid, content)
870+ // Decide media_tags and final_content based on flags
871+ let ( media_tags, final_content) = if no_media {
872+ // --no-media: clear all attachments
873+ ( Vec :: new ( ) , content. to_string ( ) )
874+ } else if !files. is_empty ( ) {
875+ // --file provided: upload files and replace attachments
876+ let mut media_tags: Vec < Vec < String > > = Vec :: new ( ) ;
877+ let mut media_content = String :: new ( ) ;
878+ for file_path in files {
879+ let desc = client
880+ . upload_file ( file_path)
881+ . await
882+ . map_err ( |e| CliError :: Other ( format ! ( "upload failed for {file_path}: {e}" ) ) ) ?;
883+ media_tags. push ( crate :: client:: build_imeta_tag ( & desc) ) ;
884+ if desc. mime_type . starts_with ( "video/" ) {
885+ media_content. push_str ( "\n  ;
886+ } else {
887+ media_content. push_str ( "\n  ;
888+ }
889+ media_content. push_str ( & desc. url ) ;
890+ media_content. push ( ')' ) ;
891+ }
892+ let final_content = if media_content. is_empty ( ) {
893+ content. to_string ( )
894+ } else {
895+ format ! ( "{}{media_content}" , content)
896+ } ;
897+ ( media_tags, final_content)
898+ } else {
899+ // Default: preserve existing attachments
900+ ( extract_imeta_tags ( & target_event) , content. to_string ( ) )
901+ } ;
902+
903+ let builder = buzz_sdk:: build_edit ( channel_uuid, target_eid, & final_content, & media_tags)
828904 . map_err ( |e| CliError :: Other ( format ! ( "build_edit failed: {e}" ) ) ) ?;
829905
830906 let event = client. sign_event ( builder) ?;
@@ -928,7 +1004,12 @@ pub async fn dispatch(
9281004 )
9291005 . await
9301006 }
931- MessagesCmd :: Edit { event, content } => cmd_edit_message ( client, & event, & content) . await ,
1007+ MessagesCmd :: Edit {
1008+ event,
1009+ content,
1010+ files,
1011+ no_media,
1012+ } => cmd_edit_message ( client, & event, & content, & files, no_media) . await ,
9321013 MessagesCmd :: Delete {
9331014 event,
9341015 action_id,
@@ -993,8 +1074,8 @@ pub async fn dispatch(
9931074#[ cfg( test) ]
9941075mod tests {
9951076 use super :: {
996- event_mention_pubkeys, find_root_from_tags , match_profiles_by_name , merge_message_mentions ,
997- missing_members, normalize_explicit_mentions, parse_member_pubkeys,
1077+ event_mention_pubkeys, extract_imeta_tags , find_root_from_tags , match_profiles_by_name ,
1078+ merge_message_mentions , missing_members, normalize_explicit_mentions, parse_member_pubkeys,
9981079 resolve_names_to_pubkeys,
9991080 } ;
10001081 use buzz_sdk:: mentions:: {
@@ -1372,4 +1453,42 @@ mod tests {
13721453 ] ;
13731454 assert_eq ! ( match_profiles_by_name( & events, "Aaron" ) . len( ) , 1 ) ;
13741455 }
1456+
1457+ #[ test]
1458+ fn extract_imeta_tags_returns_only_imeta ( ) {
1459+ let event = json ! ( {
1460+ "tags" : [
1461+ [ "h" , "channel-uuid" ] ,
1462+ [ "e" , "event-id" , "" , "reply" ] ,
1463+ [ "imeta" , "url" , "https://example.com/image.png" , "m" , "image/png" ] ,
1464+ [ "emoji" , "🎉" ] ,
1465+ [ "imeta" , "url" , "https://example.com/video.mp4" , "m" , "video/mp4" ] ,
1466+ ]
1467+ } ) ;
1468+ let imeta_tags = extract_imeta_tags ( & event) ;
1469+ assert_eq ! ( imeta_tags. len( ) , 2 ) ;
1470+ // Verify the full imeta vectors are preserved
1471+ assert_eq ! ( imeta_tags[ 0 ] [ 0 ] , "imeta" ) ;
1472+ assert_eq ! ( imeta_tags[ 0 ] [ 1 ] , "url" ) ;
1473+ assert_eq ! ( imeta_tags[ 1 ] [ 0 ] , "imeta" ) ;
1474+ }
1475+
1476+ #[ test]
1477+ fn extract_imeta_tags_empty_when_none ( ) {
1478+ let event = json ! ( {
1479+ "tags" : [
1480+ [ "h" , "channel-uuid" ] ,
1481+ [ "e" , "event-id" ] ,
1482+ ]
1483+ } ) ;
1484+ let imeta_tags = extract_imeta_tags ( & event) ;
1485+ assert ! ( imeta_tags. is_empty( ) ) ;
1486+ }
1487+
1488+ #[ test]
1489+ fn extract_imeta_tags_handles_missing_tags ( ) {
1490+ let event = json ! ( { } ) ;
1491+ let imeta_tags = extract_imeta_tags ( & event) ;
1492+ assert ! ( imeta_tags. is_empty( ) ) ;
1493+ }
13751494}
0 commit comments