2021-11-03 13:33:51 -04:00
|
|
|
use crate::{
|
|
|
|
activities::{
|
|
|
|
community::{announce::GetCommunity, send_to_community},
|
|
|
|
deletion::{receive_delete_action, verify_delete_activity, DeletableObjects},
|
|
|
|
generate_activity_id,
|
|
|
|
verify_activity,
|
|
|
|
verify_is_public,
|
|
|
|
},
|
|
|
|
activity_lists::AnnouncableActivities,
|
|
|
|
objects::{community::ApubCommunity, person::ApubPerson},
|
|
|
|
protocol::activities::deletion::{delete::Delete, undo_delete::UndoDelete},
|
|
|
|
};
|
2021-10-29 06:32:42 -04:00
|
|
|
use activitystreams::{activity::kind::UndoType, public};
|
|
|
|
use anyhow::anyhow;
|
|
|
|
use lemmy_api_common::blocking;
|
|
|
|
use lemmy_apub_lib::{
|
|
|
|
data::Data,
|
2021-11-04 20:24:10 -04:00
|
|
|
object_id::ObjectId,
|
2021-10-29 06:32:42 -04:00
|
|
|
traits::{ActivityHandler, ActorType},
|
|
|
|
};
|
|
|
|
use lemmy_db_schema::source::{comment::Comment, community::Community, post::Post};
|
|
|
|
use lemmy_utils::LemmyError;
|
|
|
|
use lemmy_websocket::{
|
|
|
|
send::{send_comment_ws_message_simple, send_community_ws_message, send_post_ws_message},
|
|
|
|
LemmyContext,
|
|
|
|
UserOperationCrud,
|
|
|
|
};
|
2021-11-03 13:33:51 -04:00
|
|
|
use url::Url;
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
|
|
|
|
#[async_trait::async_trait(?Send)]
|
2021-08-17 14:04:58 -04:00
|
|
|
impl ActivityHandler for UndoDelete {
|
2021-10-06 16:20:05 -04:00
|
|
|
type DataType = LemmyContext;
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
async fn verify(
|
|
|
|
&self,
|
2021-10-06 16:20:05 -04:00
|
|
|
context: &Data<LemmyContext>,
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
request_counter: &mut i32,
|
|
|
|
) -> Result<(), LemmyError> {
|
2021-11-06 13:44:34 -04:00
|
|
|
verify_is_public(&self.to, &self.cc)?;
|
2021-11-03 13:33:51 -04:00
|
|
|
verify_activity(&self.id, self.actor.inner(), &context.settings())?;
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
self.object.verify(context, request_counter).await?;
|
2021-10-28 08:47:56 -04:00
|
|
|
let community = self.get_community(context, request_counter).await?;
|
2021-08-17 14:04:58 -04:00
|
|
|
verify_delete_activity(
|
|
|
|
&self.object.object,
|
2021-11-03 13:33:51 -04:00
|
|
|
&self.actor,
|
2021-10-28 08:47:56 -04:00
|
|
|
&community,
|
2021-08-17 14:04:58 -04:00
|
|
|
self.object.summary.is_some(),
|
|
|
|
context,
|
|
|
|
request_counter,
|
|
|
|
)
|
|
|
|
.await?;
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn receive(
|
2021-08-12 08:48:09 -04:00
|
|
|
self,
|
2021-10-06 16:20:05 -04:00
|
|
|
context: &Data<LemmyContext>,
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
request_counter: &mut i32,
|
|
|
|
) -> Result<(), LemmyError> {
|
2021-08-17 14:04:58 -04:00
|
|
|
if self.object.summary.is_some() {
|
|
|
|
UndoDelete::receive_undo_remove_action(&self.object.object, context).await
|
|
|
|
} else {
|
|
|
|
receive_delete_action(
|
|
|
|
&self.object.object,
|
2021-08-19 17:24:33 -04:00
|
|
|
&self.actor,
|
2021-08-17 14:04:58 -04:00
|
|
|
false,
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
context,
|
2021-08-17 14:04:58 -04:00
|
|
|
request_counter,
|
Apub inbox rewrite (#1652)
* start to implement apub inbox routing lib
* got something that almost works
* it compiles!
* implemented some more
* move library code to separate crate (most of it)
* convert private message handlers
* convert all comment receivers (except undo comment)
* convert post receiver
* add verify trait
* convert community receivers
* add cc field for all activities which i forgot before
* convert inbox functions, add missing checks
* convert undo like/dislike receivers
* convert undo_delete and undo_remove receivers
* move block/unblock activities
* convert remaining activity receivers
* reimplement http signature verification and other checks
* also use actor type for routing, VerifyActivity and SendActivity traits
* cleanup and restructure apub_receive code
* wip: try to fix activity routing
* implement a (very bad) derive macro for activityhandler
* working activity routing!
* rework pm verify(), fix tests and confirm manually
also remove inbox username check which was broken
* rework following verify(), fix tests and test manually
* fix post/comment create/update, rework voting
* Rewrite remove/delete post/comment, fix tests, test manually
* Rework and fix (un)block user, announce, update post
* some code cleanup
* rework delete/remove activity receivers (still quite messy)
* rewrite, test and fix add/remove mod, update community handlers
* add docs for ActivityHandler derive macro
* dont try to compile macro comments
2021-07-17 12:08:46 -04:00
|
|
|
)
|
|
|
|
.await
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-08-17 14:04:58 -04:00
|
|
|
|
|
|
|
impl UndoDelete {
|
|
|
|
pub(in crate::activities::deletion) async fn send(
|
2021-10-18 17:36:44 -04:00
|
|
|
actor: &ApubPerson,
|
|
|
|
community: &ApubCommunity,
|
2021-08-17 14:04:58 -04:00
|
|
|
object_id: Url,
|
|
|
|
summary: Option<String>,
|
|
|
|
context: &LemmyContext,
|
|
|
|
) -> Result<(), LemmyError> {
|
2021-09-22 11:57:09 -04:00
|
|
|
let object = Delete::new(actor, community, object_id, summary, context)?;
|
2021-08-17 14:04:58 -04:00
|
|
|
|
2021-09-22 11:57:09 -04:00
|
|
|
let id = generate_activity_id(
|
|
|
|
UndoType::Undo,
|
|
|
|
&context.settings().get_protocol_and_hostname(),
|
|
|
|
)?;
|
2021-08-17 14:04:58 -04:00
|
|
|
let undo = UndoDelete {
|
2021-09-25 11:44:52 -04:00
|
|
|
actor: ObjectId::new(actor.actor_id()),
|
2021-10-25 13:22:34 -04:00
|
|
|
to: vec![public()],
|
2021-08-19 17:24:33 -04:00
|
|
|
object,
|
2021-10-28 08:47:56 -04:00
|
|
|
cc: vec![community.actor_id()],
|
2021-08-17 14:04:58 -04:00
|
|
|
kind: UndoType::Undo,
|
2021-08-19 17:24:33 -04:00
|
|
|
id: id.clone(),
|
|
|
|
unparsed: Default::default(),
|
2021-08-17 14:04:58 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
let activity = AnnouncableActivities::UndoDelete(undo);
|
2021-10-06 16:20:05 -04:00
|
|
|
send_to_community(activity, &id, actor, community, vec![], context).await
|
2021-08-17 14:04:58 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
pub(in crate::activities) async fn receive_undo_remove_action(
|
|
|
|
object: &Url,
|
|
|
|
context: &LemmyContext,
|
|
|
|
) -> Result<(), LemmyError> {
|
|
|
|
use UserOperationCrud::*;
|
|
|
|
match DeletableObjects::read_from_db(object, context).await? {
|
|
|
|
DeletableObjects::Community(community) => {
|
|
|
|
if community.local {
|
|
|
|
return Err(anyhow!("Only local admin can restore community").into());
|
|
|
|
}
|
|
|
|
let deleted_community = blocking(context.pool(), move |conn| {
|
|
|
|
Community::update_removed(conn, community.id, false)
|
|
|
|
})
|
|
|
|
.await??;
|
|
|
|
send_community_ws_message(deleted_community.id, EditCommunity, None, None, context).await?;
|
|
|
|
}
|
|
|
|
DeletableObjects::Post(post) => {
|
|
|
|
let removed_post = blocking(context.pool(), move |conn| {
|
|
|
|
Post::update_removed(conn, post.id, false)
|
|
|
|
})
|
|
|
|
.await??;
|
|
|
|
send_post_ws_message(removed_post.id, EditPost, None, None, context).await?;
|
|
|
|
}
|
|
|
|
DeletableObjects::Comment(comment) => {
|
|
|
|
let removed_comment = blocking(context.pool(), move |conn| {
|
|
|
|
Comment::update_removed(conn, comment.id, false)
|
|
|
|
})
|
|
|
|
.await??;
|
|
|
|
send_comment_ws_message_simple(removed_comment.id, EditComment, context).await?;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
2021-10-28 07:46:48 -04:00
|
|
|
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
|
|
impl GetCommunity for UndoDelete {
|
|
|
|
async fn get_community(
|
|
|
|
&self,
|
|
|
|
context: &LemmyContext,
|
|
|
|
request_counter: &mut i32,
|
|
|
|
) -> Result<ApubCommunity, LemmyError> {
|
|
|
|
self.object.get_community(context, request_counter).await
|
|
|
|
}
|
|
|
|
}
|