Remove 0.15 federation compat code (#2131)

ci-check-features
Nutomic 2022-06-02 17:48:53 +00:00 committed by GitHub
parent a2a594b763
commit 13ca1111c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions

View File

@ -6,11 +6,7 @@ use crate::{
}, },
local_instance, local_instance,
objects::{community::ApubCommunity, person::ApubPerson}, objects::{community::ApubCommunity, person::ApubPerson},
protocol::{ protocol::{activities::deletion::delete::Delete, IdOrNestedObject},
activities::deletion::delete::Delete,
objects::tombstone::Tombstone,
IdOrNestedObject,
},
}; };
use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler}; use activitypub_federation::{core::object_id::ObjectId, data::Data, traits::ActivityHandler};
use activitystreams_kinds::activity::DeleteType; use activitystreams_kinds::activity::DeleteType;
@ -118,10 +114,7 @@ impl Delete {
Ok(Delete { Ok(Delete {
actor: ObjectId::new(actor.actor_id.clone()), actor: ObjectId::new(actor.actor_id.clone()),
to: vec![to], to: vec![to],
object: IdOrNestedObject::NestedObject(Tombstone { object: IdOrNestedObject::Id(object.id()),
id: object.id(),
kind: Default::default(),
}),
cc: cc.into_iter().collect(), cc: cc.into_iter().collect(),
kind: DeleteType::Delete, kind: DeleteType::Delete,
summary, summary,