From 13ca1111c47dc93e47f96205d31768ba8ee4e8d7 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Thu, 2 Jun 2022 17:48:53 +0000 Subject: [PATCH] Remove 0.15 federation compat code (#2131) --- crates/apub/src/activities/deletion/delete.rs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/crates/apub/src/activities/deletion/delete.rs b/crates/apub/src/activities/deletion/delete.rs index eb3de179a..3cf07bc8f 100644 --- a/crates/apub/src/activities/deletion/delete.rs +++ b/crates/apub/src/activities/deletion/delete.rs @@ -6,11 +6,7 @@ use crate::{ }, local_instance, objects::{community::ApubCommunity, person::ApubPerson}, - protocol::{ - activities::deletion::delete::Delete, - objects::tombstone::Tombstone, - IdOrNestedObject, - }, + protocol::{activities::deletion::delete::Delete, IdOrNestedObject}, }; use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler}; use activitystreams_kinds::activity::DeleteType; @@ -118,10 +114,7 @@ impl Delete { Ok(Delete { actor: ObjectId::new(actor.actor_id.clone()), to: vec![to], - object: IdOrNestedObject::NestedObject(Tombstone { - id: object.id(), - kind: Default::default(), - }), + object: IdOrNestedObject::Id(object.id()), cc: cc.into_iter().collect(), kind: DeleteType::Delete, summary,