Add hashing for activity ids

.gitignore

@@ -12,6 +12,10 @@ docker/*.sql.xz
 .idea
 .vscode
 
+# macOS
+.DS_Store
+**/.DS_Store
+
 # local build files
 target
 env_setup.sh

crates/apub/activities/Cargo.toml

@@ -50,6 +50,7 @@ serde_with.workspace = true
 enum_delegate = "0.2.0"
 either = { workspace = true }
 lemmy_diesel_utils = { workspace = true }
+sha2 = "0.10.9"
 
 [dev-dependencies]
 

crates/apub/activities/src/block/block_user.rs

@@ -5,7 +5,7 @@ use crate::{
   block::{SiteOrCommunity, generate_cc},
   check_community_deleted_or_removed,
   community::send_activity_in_community,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::block::block_user::BlockUser,
   send_lemmy_activity,
 };
@@ -57,7 +57,7 @@ impl BlockUser {
       kind: BlockType::Block,
       remove_data,
       summary: Some(reason),
-      id: generate_activity_id(BlockType::Block, context)?,
+      id: generate_activity_id_with_object_id(BlockType::Block, context)?,
       end_time: expires,
       audience: target.as_ref().right().map(|c| c.ap_id.clone().into()),
     })

crates/apub/activities/src/block/undo_block_user.rs

@@ -4,7 +4,7 @@ use crate::{
   activity_lists::AnnouncableActivities,
   block::{SiteOrCommunity, generate_cc},
   community::send_activity_in_community,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
   send_lemmy_activity,
 };
@@ -47,7 +47,7 @@ impl UndoBlockUser {
     let block = BlockUser::new(target, user, mod_, None, reason, None, context).await?;
     let to = to(target)?;
 
-    let id = generate_activity_id(UndoType::Undo, context)?;
+    let id = generate_activity_id_with_object_id(UndoType::Undo, context)?;
     let undo = UndoBlockUser {
       actor: mod_.id().clone().into(),
       to,

crates/apub/activities/src/community/announce.rs

@@ -1,6 +1,6 @@
 use crate::{
   activity_lists::AnnouncableActivities,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   generate_announce_activity_id,
   protocol::{
     IdOrNestedObject,
@@ -83,15 +83,19 @@ impl AnnounceActivity {
   pub fn new(
     object: RawAnnouncableActivities,
     community: &ApubCommunity,
+    object_id: Option<&Url>,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<AnnounceActivity> {
     let inner_kind = object
       .other
       .get("type")
       .and_then(serde_json::Value::as_str)
       .unwrap_or("other");
-    let id =
-      generate_announce_activity_id(inner_kind, &context.settings().get_protocol_and_hostname())?;
+    let id = generate_announce_activity_id(
+      inner_kind,
+      &context.settings().get_protocol_and_hostname(),
+      object_id,
+    )?;
     Ok(AnnounceActivity {
       actor: community.id().clone().into(),
       to: generate_to(community)?,
@@ -112,7 +116,7 @@ impl AnnounceActivity {
     community: &ApubCommunity,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<()> {
-    let announce = AnnounceActivity::new(object.clone(), community, context)?;
+    let announce = AnnounceActivity::new(object.clone(), community, None, context)?;
     let inboxes = ActivitySendTargets::to_local_community_followers(community.id);
     send_lemmy_activity(context, announce, community, inboxes.clone(), false).await?;
 
@@ -123,14 +127,14 @@ impl AnnounceActivity {
       // Hack: need to convert Page into a format which can be sent as activity, which requires
       //       adding actor field.
       let announcable_page = RawAnnouncableActivities {
-        id: generate_activity_id(AnnounceType::Announce, context)?,
+        id: generate_activity_id_with_object_id(AnnounceType::Announce, context)?,
         actor: c.actor.clone().into_inner(),
         other: serde_json::to_value(c.object)?
           .as_object()
           .ok_or(UntranslatedError::Unreachable)?
           .clone(),
       };
-      let announce_compat = AnnounceActivity::new(announcable_page, community, context)?;
+      let announce_compat = AnnounceActivity::new(announcable_page, community, None, context)?;
       send_lemmy_activity(context, announce_compat, community, inboxes, false).await?;
     }
     Ok(())

crates/apub/activities/src/community/collection_add.rs

@@ -2,7 +2,7 @@ use crate::{
   activity_lists::AnnouncableActivities,
   check_community_deleted_or_removed,
   community::send_activity_in_community,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::community::{collection_add::CollectionAdd, collection_remove::CollectionRemove},
 };
 use activitypub_federation::{
@@ -46,7 +46,7 @@ impl CollectionAdd {
     actor: &ApubPerson,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<()> {
-    let id = generate_activity_id(AddType::Add, context)?;
+    let id = generate_activity_id_with_object_id(AddType::Add, context)?;
     let add = CollectionAdd {
       actor: actor.id().clone().into(),
       to: generate_to(community)?,
@@ -69,7 +69,7 @@ impl CollectionAdd {
     actor: &ApubPerson,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<()> {
-    let id = generate_activity_id(AddType::Add, context)?;
+    let id = generate_activity_id_with_object_id(AddType::Add, context)?;
     let add = CollectionAdd {
       actor: actor.id().clone().into(),
       to: generate_to(community)?,

crates/apub/activities/src/community/collection_remove.rs

@@ -2,7 +2,7 @@ use crate::{
   activity_lists::AnnouncableActivities,
   check_community_deleted_or_removed,
   community::send_activity_in_community,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::community::collection_remove::CollectionRemove,
 };
 use activitypub_federation::{
@@ -44,7 +44,7 @@ impl CollectionRemove {
     actor: &ApubPerson,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<()> {
-    let id = generate_activity_id(RemoveType::Remove, context)?;
+    let id = generate_activity_id_with_object_id(RemoveType::Remove, context)?;
     let remove = CollectionRemove {
       actor: actor.id().clone().into(),
       to: generate_to(community)?,
@@ -67,7 +67,7 @@ impl CollectionRemove {
     actor: &ApubPerson,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<()> {
-    let id = generate_activity_id(RemoveType::Remove, context)?;
+    let id = generate_activity_id_with_object_id(RemoveType::Remove, context)?;
     let remove = CollectionRemove {
       actor: actor.id().clone().into(),
       to: generate_to(community)?,

crates/apub/activities/src/community/lock.rs

@@ -3,7 +3,7 @@ use crate::{
   activity_lists::AnnouncableActivities,
   check_community_deleted_or_removed,
   community::send_activity_in_community,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   post_or_comment_community,
   protocol::community::lock::{LockPageOrNote, LockType, UndoLockPageOrNote},
 };
@@ -155,7 +155,7 @@ pub(crate) async fn send_lock(
   context: Data<LemmyContext>,
 ) -> LemmyResult<()> {
   let community: ApubCommunity = post_or_comment_community(&object, &context).await?.into();
-  let id = generate_activity_id(LockType::Lock, &context)?;
+  let id = generate_activity_id_with_object_id(LockType::Lock, &context)?;
   let community_id = community.ap_id.inner().clone();
   let ap_id = match object {
     PostOrComment::Left(p) => p.ap_id.clone(),
@@ -175,7 +175,7 @@ pub(crate) async fn send_lock(
   let activity = if locked {
     AnnouncableActivities::Lock(lock)
   } else {
-    let id = generate_activity_id(UndoType::Undo, &context)?;
+    let id = generate_activity_id_with_object_id(UndoType::Undo, &context)?;
     let undo = UndoLockPageOrNote {
       actor: lock.actor.clone(),
       to: generate_to(&community)?,

crates/apub/activities/src/community/report.rs

@@ -2,7 +2,7 @@ use super::{local_community, report_inboxes};
 use crate::{
   activity_lists::AnnouncableActivities,
   check_community_deleted_or_removed,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::community::{
     announce::AnnounceActivity,
     report::{Report, ReportObject},
@@ -57,7 +57,7 @@ impl Report {
     context: &Data<LemmyContext>,
   ) -> LemmyResult<Self> {
     let kind = FlagType::Flag;
-    let id = generate_activity_id(kind.clone(), context)?;
+    let id = generate_activity_id_with_object_id(kind.clone(), context)?;
     Ok(Report {
       actor: actor.id().clone().into(),
       to: [receiver.id().clone().into()],
@@ -172,7 +172,7 @@ impl Activity for Report {
       // forward to remote mods
       let object_id = self.object.object_id(context).await?;
       let announce = AnnouncableActivities::Report(self);
-      let announce = AnnounceActivity::new(announce.try_into()?, community, context)?;
+      let announce = AnnounceActivity::new(announce.try_into()?, community, None, context)?;
       let inboxes = report_inboxes(object_id, &receiver, &actor, context).await?;
       send_lemmy_activity(context, announce, community, inboxes.clone(), false).await?;
     }

crates/apub/activities/src/community/resolve_report.rs

@@ -1,7 +1,7 @@
 use super::{local_community, report_inboxes, verify_mod_or_admin_action};
 use crate::{
   activity_lists::AnnouncableActivities,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::community::{
     announce::AnnounceActivity,
     report::Report,
@@ -47,7 +47,7 @@ impl ResolveReport {
     context: Data<LemmyContext>,
   ) -> LemmyResult<()> {
     let kind = ResolveType::Resolve;
-    let id = generate_activity_id(kind.clone(), &context)?;
+    let id = generate_activity_id_with_object_id(kind.clone(), &context)?;
     let object = Report::new(&object_id, report_creator, receiver, None, &context)?;
     let resolve = ResolveReport {
       actor: actor.id().clone().into(),
@@ -106,7 +106,7 @@ impl Activity for ResolveReport {
       // forward to remote mods
       let object_id = self.object.object.object_id(context).await?;
       let announce = AnnouncableActivities::ResolveReport(self);
-      let announce = AnnounceActivity::new(announce.try_into()?, community, context)?;
+      let announce = AnnounceActivity::new(announce.try_into()?, community, None, context)?;
       let inboxes = report_inboxes(object_id, &receiver, &reporter, context).await?;
       send_lemmy_activity(context, announce, community, inboxes.clone(), false).await?;
     }

crates/apub/activities/src/community/update.rs

@@ -1,7 +1,7 @@
 use crate::{
   check_community_deleted_or_removed,
   community::{AnnouncableActivities, send_activity_in_community},
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::community::update::Update,
   send_lemmy_activity,
 };
@@ -36,7 +36,7 @@ pub(crate) async fn send_update_community(
 ) -> LemmyResult<()> {
   let community: ApubCommunity = community.into();
   let actor: ApubPerson = actor.into();
-  let id = generate_activity_id(UpdateType::Update, &context)?;
+  let id = generate_activity_id_with_object_id(UpdateType::Update, &context)?;
   let update = Update {
     actor: actor.id().clone().into(),
     to: generate_to(&community)?,
@@ -66,7 +66,7 @@ pub(crate) async fn send_update_multi_community(
 ) -> LemmyResult<()> {
   let multi: ApubMultiCommunity = multi.into();
   let actor: ApubPerson = actor.into();
-  let id = generate_activity_id(UpdateType::Update, &context)?;
+  let id = generate_activity_id_with_object_id(UpdateType::Update, &context)?;
   let update = Update {
     actor: actor.id().clone().into(),
     to: vec![multi.ap_id.clone().into(), public()],

crates/apub/activities/src/create_or_update/comment.rs

@@ -55,7 +55,10 @@ impl CreateOrUpdateNote {
       .await?
       .into();
 
-    let id = generate_activity_id(kind.clone(), &context)?;
+    // get object_id
+    let object_id = comment.activity_object_id();
+
+    let id = generate_activity_id(kind.clone(), Some(&object_id), &context)?;
     let note = ApubComment(comment).into_json(&context).await?;
 
     let create_or_update = CreateOrUpdateNote {

crates/apub/activities/src/create_or_update/post.rs

@@ -46,7 +46,9 @@ impl CreateOrUpdatePage {
     kind: CreateOrUpdateType,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<CreateOrUpdatePage> {
-    let id = generate_activity_id(kind.clone(), context)?;
+    // get object_id
+    let object_id = post.activity_object_id();
+    let id = generate_activity_id(kind.clone(), Some(&object_id), context)?;
     Ok(CreateOrUpdatePage {
       actor: actor.id().clone().into(),
       to: generate_to(community)?,

crates/apub/activities/src/create_or_update/private_message.rs

@@ -24,7 +24,11 @@ pub(crate) async fn send_create_or_update_pm(
   let actor: ApubPerson = pm_view.creator.into();
   let recipient: ApubPerson = pm_view.recipient.into();
 
-  let id = generate_activity_id(kind.clone(), &context)?;
+  // get object_id
+  let pm = &pm_view.private_message;
+  let object_id = pm.activity_object_id();
+
+  let id = generate_activity_id(kind.clone(), Some(&object_id), &context)?;
   let create_or_update = CreateOrUpdatePrivateMessage {
     id: id.clone(),
     actor: actor.id().clone().into(),

crates/apub/activities/src/deletion/delete.rs

@@ -1,7 +1,7 @@
 use crate::{
   MOD_ACTION_DEFAULT_REASON,
   deletion::{DeletableObjects, receive_delete_action, verify_delete_activity},
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::{IdOrNestedObject, deletion::delete::Delete},
 };
 use activitypub_federation::{config::Data, kinds::activity::DeleteType, traits::Activity};
@@ -82,7 +82,7 @@ impl Delete {
     with_replies: Option<bool>,
     context: &Data<LemmyContext>,
   ) -> LemmyResult<Delete> {
-    let id = generate_activity_id(DeleteType::Delete, context)?;
+    let id = generate_activity_id_with_object_id(DeleteType::Delete, context)?;
     let cc: Option<Url> = community.map(|c| c.ap_id.clone().into());
     Ok(Delete {
       actor: actor.ap_id.clone().into(),

crates/apub/activities/src/deletion/undo_delete.rs

@@ -1,6 +1,6 @@
 use crate::{
   deletion::{DeletableObjects, receive_delete_action, verify_delete_activity},
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::deletion::{delete::Delete, undo_delete::UndoDelete},
 };
 use activitypub_federation::{config::Data, kinds::activity::UndoType, traits::Activity};
@@ -72,7 +72,7 @@ impl UndoDelete {
       context,
     )?;
 
-    let id = generate_activity_id(UndoType::Undo, context)?;
+    let id = generate_activity_id_with_object_id(UndoType::Undo, context)?;
     let cc: Option<Url> = community.map(|c| c.ap_id.clone().into());
     Ok(UndoDelete {
       actor: actor.ap_id.clone().into(),

crates/apub/activities/src/following/accept.rs

@@ -1,6 +1,6 @@
 use crate::{
   check_community_deleted_or_removed,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::following::{accept::AcceptFollow, follow::Follow},
   send_lemmy_activity,
 };
@@ -27,7 +27,7 @@ impl AcceptFollow {
       to: Some([person.id().clone().into()]),
       object: follow,
       kind: AcceptType::Accept,
-      id: generate_activity_id(AcceptType::Accept, context)?,
+      id: generate_activity_id_with_object_id(AcceptType::Accept, context)?,
     };
     let inbox = ActivitySendTargets::to_inbox(person.shared_inbox_or_inbox());
     send_lemmy_activity(context, accept, &target, inbox, true).await

crates/apub/activities/src/following/follow.rs

@@ -1,6 +1,6 @@
 use crate::{
   check_community_deleted_or_removed,
-  generate_activity_id,
+  generate_activity_id_with_object_id,
   protocol::following::{accept::AcceptFollow, follow::Follow},
   send_lemmy_activity,
 };
@@ -40,7 +40,7 @@ impl Follow {
       object: target.id().clone().into(),
       to: Some([target.id().clone().into()]),
       kind: FollowType::Follow,
-      id: generate_activity_id(FollowType::Follow, context)?,
+      id: generate_activity_id_with_object_id(FollowType::Follow, context)?,
     })
   }