From: Nutomic <me@nutomic.com>
Date: Thu, 3 Mar 2022 19:37:12 +0000 (+0000)
Subject: Make delete activities backwards compatible with 0.15 (#2114)
X-Git-Url: http://these/git/%7B%60%24%7BghostArchiveUrl%7D/static/%7B%60%24%7BwebArchiveUrl%7D/save/%7B%60https:/%24%7Bsubmission.url%7D?a=commitdiff_plain;h=df757f28b4c4e4b5b8b32db992bdc74f6baebabf;p=lemmy.git

Make delete activities backwards compatible with 0.15 (#2114)
---

diff --git a/crates/apub/src/activities/deletion/delete.rs b/crates/apub/src/activities/deletion/delete.rs
index e141fcad..3bb4b5bc 100644
--- a/crates/apub/src/activities/deletion/delete.rs
+++ b/crates/apub/src/activities/deletion/delete.rs
@@ -6,7 +6,7 @@ use crate::{
     verify_activity,
   },
   objects::{community::ApubCommunity, person::ApubPerson},
-  protocol::activities::deletion::delete::{Delete, IdOrNestedObject},
+  protocol::activities::deletion::delete::{Delete, IdOrNestedObject, NestedObject},
 };
 use activitystreams_kinds::activity::DeleteType;
 use anyhow::anyhow;
@@ -104,7 +104,10 @@ impl Delete {
     Ok(Delete {
       actor: ObjectId::new(actor.actor_id.clone()),
       to: vec![to],
-      object: IdOrNestedObject::Id(object.id()),
+      object: IdOrNestedObject::NestedObject(NestedObject {
+        id: object.id(),
+        kind: Default::default(),
+      }),
       cc: cc.into_iter().collect(),
       kind: DeleteType::Delete,
       summary,
diff --git a/crates/apub/src/protocol/activities/deletion/delete.rs b/crates/apub/src/protocol/activities/deletion/delete.rs
index 6913652f..d3ec53be 100644
--- a/crates/apub/src/protocol/activities/deletion/delete.rs
+++ b/crates/apub/src/protocol/activities/deletion/delete.rs
@@ -1,5 +1,5 @@
 use crate::{objects::person::ApubPerson, protocol::Unparsed};
-use activitystreams_kinds::activity::DeleteType;
+use activitystreams_kinds::{activity::DeleteType, object::TombstoneType};
 use lemmy_apub_lib::object_id::ObjectId;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
@@ -39,7 +39,10 @@ pub(crate) enum IdOrNestedObject {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub(crate) struct NestedObject {
-  id: Url,
+  pub(crate) id: Url,
+  // Backwards compatibility with Lemmy 0.15
+  #[serde(rename = "type")]
+  pub(crate) kind: TombstoneType,
 }
 
 impl IdOrNestedObject {