X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fapub%2Fsrc%2Factivities%2Fprivate_message%2Fdelete.rs;h=82aad3177b241ab73a6178a8f504d67b5e5f1861;hb=527eefbe92a4796b957fb232831f7e7c80511ed9;hp=47e1a71a158169a1a637d3472e35cff30141017a;hpb=21346eb786dc75efaca19e6de8a514fab3d33da8;p=lemmy.git diff --git a/crates/apub/src/activities/private_message/delete.rs b/crates/apub/src/activities/private_message/delete.rs index 47e1a71a..82aad317 100644 --- a/crates/apub/src/activities/private_message/delete.rs +++ b/crates/apub/src/activities/private_message/delete.rs @@ -2,6 +2,7 @@ use crate::{ activities::{generate_activity_id, verify_activity, verify_person}, activity_queue::send_activity_new, extensions::context::lemmy_context, + fetcher::object_id::ObjectId, ActorType, }; use activitystreams::{ @@ -22,8 +23,8 @@ use url::Url; #[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)] #[serde(rename_all = "camelCase")] pub struct DeletePrivateMessage { - actor: Url, - to: Url, + actor: ObjectId, + to: ObjectId, pub(in crate::activities::private_message) object: Url, #[serde(rename = "type")] kind: DeleteType, @@ -40,8 +41,8 @@ impl DeletePrivateMessage { pm: &PrivateMessage, ) -> Result { Ok(DeletePrivateMessage { - actor: actor.actor_id(), - to: actor.actor_id(), + actor: ObjectId::new(actor.actor_id()), + to: ObjectId::new(actor.actor_id()), object: pm.ap_id.clone().into(), kind: DeleteType::Delete, id: generate_activity_id(DeleteType::Delete)?, @@ -74,7 +75,7 @@ impl ActivityHandler for DeletePrivateMessage { ) -> Result<(), LemmyError> { verify_activity(self)?; verify_person(&self.actor, context, request_counter).await?; - verify_domains_match(&self.actor, &self.object)?; + verify_domains_match(self.actor.inner(), &self.object)?; Ok(()) }