GKaszewski/thoughts
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(activitypub-base): deterministic announce IDs so Undo(Announce) can reference original activity

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-05-14 14:16:48 +02:00
parent b0b3c6a59b
commit 2485869af6
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/adapters/activitypub-base/src/service.rs
View File

@@ -175,8 +175,19 @@ impl ActivityPubService {
return Ok(());
}
// Deterministic ID so Undo(Announce) can reference this same activity.
let announce_id = url::Url::parse(&format!(
"{}/activities/announce/{}",
self.base_url,
uuid::Uuid::new_v5(
&uuid::Uuid::NAMESPACE_URL,
format!("{}/{}", local_user_id, object_ap_id).as_bytes(),
)
))
.map_err(|e| anyhow::anyhow!("{e}"))?;
let announce = crate::activities::AnnounceActivity {
id: crate::urls::activity_url(&self.base_url).map_err(|e| anyhow::anyhow!("{e}"))?,
id: announce_id,
kind: Default::default(),
actor: activitypub_federation::fetch::object_id::ObjectId::from(local_actor.ap_id.clone()),
object: object_ap_id,
@@ -235,6 +246,17 @@ impl ActivityPubService {
return Ok(());
}
// Reconstruct the same deterministic announce ID used when the boost was sent.
let announce_id = url::Url::parse(&format!(
"{}/activities/announce/{}",
self.base_url,
uuid::Uuid::new_v5(
&uuid::Uuid::NAMESPACE_URL,
format!("{}/{}", local_user_id, object_ap_id).as_bytes(),
)
))
.map_err(|e| anyhow::anyhow!("{e}"))?;
let undo_id = crate::urls::activity_url(&self.base_url).map_err(|e| anyhow::anyhow!("{e}"))?;
let undo = crate::activities::UndoActivity {
id: undo_id,
@@ -242,6 +264,7 @@ impl ActivityPubService {
actor: activitypub_federation::fetch::object_id::ObjectId::from(local_actor.ap_id.clone()),
object: serde_json::json!({
"type": "Announce",
"id": announce_id.to_string(),
"actor": local_actor.ap_id.to_string(),
"object": object_ap_id.to_string(),
}),