mirror of https://github.com/LemmyNet/lemmy.git
Remove delete backwards compat
parent
c0281dfb1c
commit
b8c045059c
|
@ -8,9 +8,9 @@ use crate::{
|
||||||
},
|
},
|
||||||
activity_lists::AnnouncableActivities,
|
activity_lists::AnnouncableActivities,
|
||||||
objects::{community::ApubCommunity, person::ApubPerson},
|
objects::{community::ApubCommunity, person::ApubPerson},
|
||||||
protocol::activities::deletion::delete::{Delete, ObjectOrTombstone},
|
protocol::activities::deletion::delete::{Delete, Tombstone},
|
||||||
};
|
};
|
||||||
use activitystreams::{activity::kind::DeleteType, public};
|
use activitystreams::{activity::kind::DeleteType, object::kind::TombstoneType, public};
|
||||||
use anyhow::anyhow;
|
use anyhow::anyhow;
|
||||||
use lemmy_api_common::blocking;
|
use lemmy_api_common::blocking;
|
||||||
use lemmy_apub_lib::{
|
use lemmy_apub_lib::{
|
||||||
|
@ -50,12 +50,11 @@ impl ActivityHandler for Delete {
|
||||||
context: &Data<LemmyContext>,
|
context: &Data<LemmyContext>,
|
||||||
request_counter: &mut i32,
|
request_counter: &mut i32,
|
||||||
) -> Result<(), LemmyError> {
|
) -> Result<(), LemmyError> {
|
||||||
let cc = self.cc.as_deref().unwrap_or(&[]);
|
verify_is_public(&self.to, &[])?;
|
||||||
verify_is_public(&self.to, cc)?;
|
|
||||||
verify_activity(&self.id, self.actor.inner(), &context.settings())?;
|
verify_activity(&self.id, self.actor.inner(), &context.settings())?;
|
||||||
let community = self.get_community(context, request_counter).await?;
|
let community = self.get_community(context, request_counter).await?;
|
||||||
verify_delete_activity(
|
verify_delete_activity(
|
||||||
self.object.as_url(),
|
&self.object.id,
|
||||||
&self.actor,
|
&self.actor,
|
||||||
&community,
|
&community,
|
||||||
self.summary.is_some(),
|
self.summary.is_some(),
|
||||||
|
@ -81,21 +80,14 @@ impl ActivityHandler for Delete {
|
||||||
};
|
};
|
||||||
receive_remove_action(
|
receive_remove_action(
|
||||||
&self.actor,
|
&self.actor,
|
||||||
self.object.as_url(),
|
&self.object.id,
|
||||||
reason,
|
reason,
|
||||||
context,
|
context,
|
||||||
request_counter,
|
request_counter,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
} else {
|
} else {
|
||||||
receive_delete_action(
|
receive_delete_action(&self.object.id, &self.actor, true, context, request_counter).await
|
||||||
self.object.as_url(),
|
|
||||||
&self.actor,
|
|
||||||
true,
|
|
||||||
context,
|
|
||||||
request_counter,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -103,7 +95,6 @@ impl ActivityHandler for Delete {
|
||||||
impl Delete {
|
impl Delete {
|
||||||
pub(in crate::activities::deletion) fn new(
|
pub(in crate::activities::deletion) fn new(
|
||||||
actor: &ApubPerson,
|
actor: &ApubPerson,
|
||||||
community: &ApubCommunity,
|
|
||||||
object_id: Url,
|
object_id: Url,
|
||||||
summary: Option<String>,
|
summary: Option<String>,
|
||||||
context: &LemmyContext,
|
context: &LemmyContext,
|
||||||
|
@ -111,8 +102,10 @@ impl Delete {
|
||||||
Ok(Delete {
|
Ok(Delete {
|
||||||
actor: ObjectId::new(actor.actor_id()),
|
actor: ObjectId::new(actor.actor_id()),
|
||||||
to: vec![public()],
|
to: vec![public()],
|
||||||
object: ObjectOrTombstone::Url(object_id),
|
object: Tombstone {
|
||||||
cc: Some(vec![community.actor_id()]),
|
id: object_id,
|
||||||
|
kind: TombstoneType::Tombstone,
|
||||||
|
},
|
||||||
kind: DeleteType::Delete,
|
kind: DeleteType::Delete,
|
||||||
summary,
|
summary,
|
||||||
id: generate_activity_id(
|
id: generate_activity_id(
|
||||||
|
@ -129,7 +122,7 @@ impl Delete {
|
||||||
summary: Option<String>,
|
summary: Option<String>,
|
||||||
context: &LemmyContext,
|
context: &LemmyContext,
|
||||||
) -> Result<(), LemmyError> {
|
) -> Result<(), LemmyError> {
|
||||||
let delete = Delete::new(actor, community, object_id, summary, context)?;
|
let delete = Delete::new(actor, object_id, summary, context)?;
|
||||||
let delete_id = delete.id.clone();
|
let delete_id = delete.id.clone();
|
||||||
|
|
||||||
let activity = AnnouncableActivities::Delete(delete);
|
let activity = AnnouncableActivities::Delete(delete);
|
||||||
|
@ -216,7 +209,7 @@ impl GetCommunity for Delete {
|
||||||
context: &LemmyContext,
|
context: &LemmyContext,
|
||||||
_request_counter: &mut i32,
|
_request_counter: &mut i32,
|
||||||
) -> Result<ApubCommunity, LemmyError> {
|
) -> Result<ApubCommunity, LemmyError> {
|
||||||
let community_id = match DeletableObjects::read_from_db(self.object.as_url(), context).await? {
|
let community_id = match DeletableObjects::read_from_db(&self.object.id, context).await? {
|
||||||
DeletableObjects::Community(c) => c.id,
|
DeletableObjects::Community(c) => c.id,
|
||||||
DeletableObjects::Comment(c) => {
|
DeletableObjects::Comment(c) => {
|
||||||
let post = blocking(context.pool(), move |conn| Post::read(conn, c.post_id)).await??;
|
let post = blocking(context.pool(), move |conn| Post::read(conn, c.post_id)).await??;
|
||||||
|
|
|
@ -40,7 +40,7 @@ impl ActivityHandler for UndoDelete {
|
||||||
self.object.verify(context, request_counter).await?;
|
self.object.verify(context, request_counter).await?;
|
||||||
let community = self.get_community(context, request_counter).await?;
|
let community = self.get_community(context, request_counter).await?;
|
||||||
verify_delete_activity(
|
verify_delete_activity(
|
||||||
self.object.object.as_url(),
|
&self.object.object.id,
|
||||||
&self.actor,
|
&self.actor,
|
||||||
&community,
|
&community,
|
||||||
self.object.summary.is_some(),
|
self.object.summary.is_some(),
|
||||||
|
@ -57,10 +57,10 @@ impl ActivityHandler for UndoDelete {
|
||||||
request_counter: &mut i32,
|
request_counter: &mut i32,
|
||||||
) -> Result<(), LemmyError> {
|
) -> Result<(), LemmyError> {
|
||||||
if self.object.summary.is_some() {
|
if self.object.summary.is_some() {
|
||||||
UndoDelete::receive_undo_remove_action(self.object.object.as_url(), context).await
|
UndoDelete::receive_undo_remove_action(&self.object.object.id, context).await
|
||||||
} else {
|
} else {
|
||||||
receive_delete_action(
|
receive_delete_action(
|
||||||
self.object.object.as_url(),
|
&self.object.object.id,
|
||||||
&self.actor,
|
&self.actor,
|
||||||
false,
|
false,
|
||||||
context,
|
context,
|
||||||
|
@ -79,7 +79,7 @@ impl UndoDelete {
|
||||||
summary: Option<String>,
|
summary: Option<String>,
|
||||||
context: &LemmyContext,
|
context: &LemmyContext,
|
||||||
) -> Result<(), LemmyError> {
|
) -> Result<(), LemmyError> {
|
||||||
let object = Delete::new(actor, community, object_id, summary, context)?;
|
let object = Delete::new(actor, object_id, summary, context)?;
|
||||||
|
|
||||||
let id = generate_activity_id(
|
let id = generate_activity_id(
|
||||||
UndoType::Undo,
|
UndoType::Undo,
|
||||||
|
|
|
@ -10,15 +10,11 @@ use serde_with::skip_serializing_none;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize)]
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
||||||
#[serde(untagged)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub enum ObjectOrTombstone {
|
pub struct Tombstone {
|
||||||
Url(Url),
|
pub(crate) id: Url,
|
||||||
Tombstone {
|
#[serde(rename = "type")]
|
||||||
id: Url,
|
pub(crate) kind: TombstoneType,
|
||||||
#[serde(rename = "type")]
|
|
||||||
kind: TombstoneType,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[skip_serializing_none]
|
#[skip_serializing_none]
|
||||||
|
@ -27,8 +23,7 @@ pub enum ObjectOrTombstone {
|
||||||
pub struct Delete {
|
pub struct Delete {
|
||||||
pub(crate) actor: ObjectId<ApubPerson>,
|
pub(crate) actor: ObjectId<ApubPerson>,
|
||||||
pub(crate) to: Vec<Url>,
|
pub(crate) to: Vec<Url>,
|
||||||
pub(crate) object: ObjectOrTombstone,
|
pub(crate) object: Tombstone,
|
||||||
pub(crate) cc: Option<Vec<Url>>,
|
|
||||||
#[serde(rename = "type")]
|
#[serde(rename = "type")]
|
||||||
pub(crate) kind: DeleteType,
|
pub(crate) kind: DeleteType,
|
||||||
/// If summary is present, this is a mod action (Remove in Lemmy terms). Otherwise, its a user
|
/// If summary is present, this is a mod action (Remove in Lemmy terms). Otherwise, its a user
|
||||||
|
@ -38,12 +33,3 @@ pub struct Delete {
|
||||||
#[serde(flatten)]
|
#[serde(flatten)]
|
||||||
pub(crate) unparsed: Unparsed,
|
pub(crate) unparsed: Unparsed,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl ObjectOrTombstone {
|
|
||||||
pub fn as_url(&self) -> &Url {
|
|
||||||
match self {
|
|
||||||
Self::Url(ref url) => url,
|
|
||||||
Self::Tombstone { ref id, .. } => id,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue