2021-07-17 16:20:44 +00:00
|
|
|
use crate::{
|
|
|
|
activities::{
|
|
|
|
comment::send_websocket_message as send_comment_message,
|
|
|
|
community::send_websocket_message as send_community_message,
|
|
|
|
post::send_websocket_message as send_post_message,
|
|
|
|
removal::remove::RemovePostCommentCommunityOrMod,
|
|
|
|
verify_activity,
|
|
|
|
verify_mod_action,
|
|
|
|
verify_person_in_community,
|
|
|
|
},
|
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 16:08:46 +00:00
|
|
|
fetcher::{
|
|
|
|
community::get_or_fetch_and_upsert_community,
|
|
|
|
objects::get_or_fetch_and_insert_post_or_comment,
|
|
|
|
},
|
|
|
|
PostOrComment,
|
|
|
|
};
|
2021-07-17 16:20:44 +00:00
|
|
|
use activitystreams::activity::kind::UndoType;
|
|
|
|
use anyhow::anyhow;
|
|
|
|
use lemmy_api_common::blocking;
|
2021-07-30 14:35:32 +00:00
|
|
|
use lemmy_apub_lib::{values::PublicUrl, ActivityCommonFields, ActivityHandler};
|
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 16:08:46 +00:00
|
|
|
use lemmy_db_queries::source::{comment::Comment_, community::Community_, post::Post_};
|
|
|
|
use lemmy_db_schema::source::{comment::Comment, community::Community, post::Post};
|
|
|
|
use lemmy_utils::LemmyError;
|
|
|
|
use lemmy_websocket::{LemmyContext, UserOperationCrud};
|
|
|
|
use url::Url;
|
|
|
|
|
|
|
|
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
|
|
|
|
#[serde(rename_all = "camelCase")]
|
|
|
|
pub struct UndoRemovePostCommentOrCommunity {
|
|
|
|
to: PublicUrl,
|
|
|
|
object: RemovePostCommentCommunityOrMod,
|
|
|
|
cc: [Url; 1],
|
|
|
|
#[serde(rename = "type")]
|
|
|
|
kind: UndoType,
|
|
|
|
#[serde(flatten)]
|
|
|
|
common: ActivityCommonFields,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
|
|
impl ActivityHandler for UndoRemovePostCommentOrCommunity {
|
|
|
|
async fn verify(
|
|
|
|
&self,
|
|
|
|
context: &LemmyContext,
|
|
|
|
request_counter: &mut i32,
|
|
|
|
) -> Result<(), LemmyError> {
|
|
|
|
verify_activity(self.common())?;
|
|
|
|
let object_community =
|
|
|
|
get_or_fetch_and_upsert_community(&self.object.object, context, request_counter).await;
|
|
|
|
// removing a community
|
|
|
|
if object_community.is_ok() {
|
|
|
|
verify_mod_action(&self.common.actor, self.object.object.clone(), context).await?;
|
|
|
|
}
|
|
|
|
// removing a post or comment
|
|
|
|
else {
|
2021-07-27 22:18:50 +00:00
|
|
|
verify_person_in_community(&self.common.actor, &self.cc[0], 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 16:08:46 +00:00
|
|
|
verify_mod_action(&self.common.actor, self.cc[0].clone(), context).await?;
|
|
|
|
}
|
|
|
|
self.object.verify(context, request_counter).await?;
|
|
|
|
// dont check that actor and object.actor are identical, so that one mod can
|
|
|
|
// undo the action of another
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
async fn receive(
|
2021-08-12 12:48:09 +00:00
|
|
|
self,
|
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 16:08:46 +00:00
|
|
|
context: &LemmyContext,
|
|
|
|
request_counter: &mut i32,
|
|
|
|
) -> Result<(), LemmyError> {
|
|
|
|
let object_community =
|
|
|
|
get_or_fetch_and_upsert_community(&self.object.object, context, request_counter).await;
|
|
|
|
// restoring a community
|
|
|
|
if let Ok(community) = object_community {
|
|
|
|
if community.local {
|
|
|
|
return Err(anyhow!("Only local admin can undo remove community").into());
|
|
|
|
}
|
|
|
|
let deleted_community = blocking(context.pool(), move |conn| {
|
|
|
|
Community::update_removed(conn, community.id, false)
|
|
|
|
})
|
|
|
|
.await??;
|
|
|
|
|
|
|
|
send_community_message(
|
|
|
|
deleted_community.id,
|
|
|
|
UserOperationCrud::EditCommunity,
|
|
|
|
context,
|
|
|
|
)
|
|
|
|
.await
|
|
|
|
}
|
|
|
|
// restoring a post or comment
|
|
|
|
else {
|
|
|
|
match get_or_fetch_and_insert_post_or_comment(&self.object.object, context, request_counter)
|
|
|
|
.await?
|
|
|
|
{
|
|
|
|
PostOrComment::Post(post) => {
|
|
|
|
let removed_post = blocking(context.pool(), move |conn| {
|
|
|
|
Post::update_removed(conn, post.id, false)
|
|
|
|
})
|
|
|
|
.await??;
|
|
|
|
send_post_message(removed_post.id, UserOperationCrud::EditPost, context).await
|
|
|
|
}
|
|
|
|
PostOrComment::Comment(comment) => {
|
|
|
|
let removed_comment = blocking(context.pool(), move |conn| {
|
|
|
|
Comment::update_removed(conn, comment.id, false)
|
|
|
|
})
|
|
|
|
.await??;
|
|
|
|
send_comment_message(
|
|
|
|
removed_comment.id,
|
|
|
|
vec![],
|
|
|
|
UserOperationCrud::EditComment,
|
|
|
|
context,
|
|
|
|
)
|
|
|
|
.await
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn common(&self) -> &ActivityCommonFields {
|
|
|
|
&self.common
|
|
|
|
}
|
|
|
|
}
|