Skip to content

Commit 330805c

Browse files
authored
Merge branch 'main' into new-dm-avatar-flicker
2 parents a2ea37f + 8cce12f commit 330805c

29 files changed

Lines changed: 2431 additions & 66 deletions

‎Cargo.lock‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Justfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,9 +680,9 @@ test-integration:
680680
./scripts/run-tests.sh integration
681681

682682
# Enforce-mode upload/publication/read journey (requires PostgreSQL and Redis).
683-
# Uses the isolated PostgreSQL runner, including emoji entry replacement checks.
683+
# Uses the isolated PostgreSQL runner, including CLI edits and the target index.
684684
test-media-access:
685-
./scripts/postgres-test-run.sh -p buzz-relay --lib -E 'test(=api::media_access_postgres_tests::private_media_revocation_http_journey)'
685+
./scripts/postgres-test-run.sh -p buzz-relay -p buzz-db --lib -E 'test(/^api::media_access_postgres_tests::/) | test(effective_edit_uses_target_index) | test(historical_edit_preflight)'
686686

687687
# Regenerate the model-capability normative corpus from the production Rust
688688
# resolver. The corpus is a golden snapshot, never hand-edited: this runs the

‎crates/buzz-cli/TESTING.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@ buzz messages search --query "CLI test" --limit 5 | jq .
235235

236236
# messages edit
237237
buzz messages edit --event "$EVENT_ID" --content "Edited by CLI test" | jq .
238+
# Explicit removal stays removed in a subsequent text edit.
239+
buzz messages edit --event "$EVENT_ID" --content "Remove attached files" --clear-attachments | jq .
240+
buzz messages edit --event "$EVENT_ID" --content "Still no attachments" | jq .
238241

239242
# messages delete
240243
buzz messages delete --event "$REPLY_ID" | jq .

‎crates/buzz-cli/src/commands/messages.rs‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
mod edit;
2+
13
use buzz_sdk::{DeleteMessageOptions, DiffMeta, ThreadRef, VoteDirection};
24
use nostr::PublicKey;
35
use uuid::Uuid;
@@ -895,29 +897,6 @@ pub async fn cmd_delete_message(
895897
Ok(())
896898
}
897899

898-
/// Edit a message you previously sent.
899-
pub async fn cmd_edit_message(
900-
client: &BuzzClient,
901-
event_id: &str,
902-
content: &str,
903-
) -> Result<(), CliError> {
904-
validate_hex64(event_id)?;
905-
validate_content_size(content)?;
906-
907-
// Resolve channel_id from the event's h-tag
908-
let channel_uuid = resolve_channel_id(client, event_id).await?;
909-
let target_eid = parse_event_id(event_id)?;
910-
911-
let builder = buzz_sdk::build_edit(channel_uuid, target_eid, content)
912-
.map_err(|e| CliError::Other(format!("build_edit failed: {e}")))?;
913-
914-
let event = client.sign_event(builder).await?;
915-
916-
let resp = client.submit_event(event).await?;
917-
println!("{}", normalize_write_response(&resp));
918-
Ok(())
919-
}
920-
921900
/// Vote on a forum post or comment.
922901
pub async fn cmd_vote_on_post(
923902
client: &BuzzClient,
@@ -1014,7 +993,11 @@ pub async fn dispatch(
1014993
)
1015994
.await
1016995
}
1017-
MessagesCmd::Edit { event, content } => cmd_edit_message(client, &event, &content).await,
996+
MessagesCmd::Edit {
997+
event,
998+
content,
999+
clear_attachments,
1000+
} => edit::edit_message(client, &event, &content, clear_attachments).await,
10181001
MessagesCmd::Delete {
10191002
event,
10201003
action_id,
Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
//! Resolve replacement attachment state before publishing an edit.
2+
use super::{channel_id_from_event, fetch_event};
3+
use crate::{
4+
client::BuzzClient,
5+
error::CliError,
6+
validate::{parse_event_id, validate_content_size, validate_hex64},
7+
};
8+
use nostr::{Event, Timestamp};
9+
10+
pub(super) async fn edit_message(
11+
client: &BuzzClient,
12+
event_id: &str,
13+
content: &str,
14+
clear_attachments: bool,
15+
) -> Result<(), CliError> {
16+
validate_hex64(event_id)?;
17+
validate_content_size(content)?;
18+
let target = parse_event_id(event_id)?;
19+
let raw = fetch_event(client, &target.to_hex()).await?;
20+
let channel = channel_id_from_event(event_id, &raw)?;
21+
let original: Event = serde_json::from_value(raw)
22+
.map_err(|e| CliError::Other(format!("invalid edit target: {e}")))?;
23+
if original.id != target {
24+
return Err(CliError::Other(
25+
"relay returned the wrong edit target".into(),
26+
));
27+
}
28+
// Keep this boundary aligned with media_reference_query and the relay lookup.
29+
// Other channel-tagged events retain the historical plain-edit behavior.
30+
if !buzz_core::media::EDIT_GOVERNED_KINDS.contains(&original.kind.as_u16()) {
31+
if clear_attachments {
32+
return Err(CliError::Usage(format!(
33+
"attachments on kind {} are not edit-governed",
34+
original.kind.as_u16()
35+
)));
36+
}
37+
let builder = buzz_sdk::build_edit(channel, target, content)
38+
.map_err(|e| CliError::Other(format!("build_edit failed: {e}")))?;
39+
let event = client.sign_event(builder).await?;
40+
let resp = client.submit_event(event).await?;
41+
println!("{}", crate::client::normalize_write_response(&resp));
42+
return Ok(());
43+
}
44+
let raw = client
45+
.query(&serde_json::json!({
46+
"kinds": buzz_core::media::EDIT_GOVERNED_KINDS, "ids": [target.to_hex()], "#h": [channel.to_string()],
47+
"effective_edit": 1, "consistency": "strong",
48+
}))
49+
.await?;
50+
let snapshot: serde_json::Value = serde_json::from_str(&raw)
51+
.map_err(|e| CliError::Other(format!("invalid effective edit response: {e}")))?;
52+
if snapshot.get("effective_edit") != Some(&serde_json::json!(1))
53+
|| snapshot.get("edit").is_none()
54+
{
55+
return Err(CliError::Other(
56+
"relay does not support effective_edit v1; upgrade the relay before editing".into(),
57+
));
58+
}
59+
let original: Event = serde_json::from_value(snapshot["original"].clone())
60+
.map_err(|e| CliError::Other(format!("invalid effective original: {e}")))?;
61+
if original.id != target
62+
|| !buzz_core::media::EDIT_GOVERNED_KINDS.contains(&original.kind.as_u16())
63+
|| channel_id_from_event(event_id, &snapshot["original"])? != channel
64+
{
65+
return Err(CliError::Other(
66+
"effective edit response has the wrong original".into(),
67+
));
68+
}
69+
let edits: Vec<Event> = if snapshot["edit"].is_null() {
70+
vec![]
71+
} else {
72+
vec![serde_json::from_value(snapshot["edit"].clone())
73+
.map_err(|e| CliError::Other(format!("invalid effective edit: {e}")))?]
74+
};
75+
let effective = latest_edit(&original, &edits);
76+
if !edits.is_empty() && effective.id == original.id {
77+
return Err(CliError::Other(
78+
"effective edit response has the wrong replacement".into(),
79+
));
80+
}
81+
let media = if clear_attachments {
82+
Vec::new()
83+
} else {
84+
effective
85+
.tags
86+
.iter()
87+
.filter(|t| t.as_slice().first().map(String::as_str) == Some("imeta"))
88+
.map(|t| t.as_slice().to_vec())
89+
.collect()
90+
};
91+
let now = Timestamp::now().as_secs();
92+
// Make successive edits effective even when issued in the same second.
93+
// Refuse an unexpectedly future timeline instead of extending it forever.
94+
let head = effective.created_at.as_secs();
95+
if head > now.saturating_add(60) {
96+
return Err(CliError::Other(
97+
"latest edit is too far in the future; retry when the clock catches up".into(),
98+
));
99+
}
100+
let created_at = now.max(head + 1);
101+
let builder = buzz_sdk::build_edit_with_media(channel, target, content, &media)
102+
.map_err(|e| CliError::Other(format!("build_edit failed: {e}")))?
103+
.custom_created_at(Timestamp::from(created_at));
104+
let event = client.sign_event(builder).await?;
105+
let resp = client.submit_event(event).await?;
106+
println!("{}", crate::client::normalize_write_response(&resp));
107+
Ok(())
108+
}
109+
110+
fn latest_edit<'a>(original: &'a Event, edits: &'a [Event]) -> &'a Event {
111+
let channel = |event: &Event| {
112+
event
113+
.tags
114+
.iter()
115+
.find(|t| t.as_slice().first().map(String::as_str) == Some("h"))
116+
.and_then(|t| t.content())
117+
.and_then(|id| uuid::Uuid::parse_str(id).ok())
118+
};
119+
edits
120+
.iter()
121+
.filter(|edit| {
122+
edit.kind.as_u16() == 40003
123+
&& channel(edit) == channel(original)
124+
&& buzz_core::media::first_edit_target(edit).as_deref()
125+
== Some(original.id.as_bytes().as_slice())
126+
})
127+
.max_by_key(|edit| (edit.created_at, edit.id))
128+
.unwrap_or(original)
129+
}
130+
131+
#[cfg(test)]
132+
mod tests;

0 commit comments

Comments
 (0)