21a87ebaf2
* more robust test of unlike a comment, confirm replication to instance downstream from community home * more robust 'delete a comment' test, confirm replication * Far more robust "Report a comment" test. Many comments about situation, this is currently failing because gamma does not get the report * typo and actually have Gamma comment check use gamma, not alpha * prepare-drone-federation-test.sh has some more echo output and note about the LEMMY_DATABASE_URL format (#3651) * Add http cache for webfingers (#3317) * Add http cache for webfingers * Remove the outgoing cache middleware & adjust the cache headers directive * Use 1h & 3day cache header * Update routes and adjust the cache headers location * revert apub caching --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: Felix Ableitner <me@nutomic.com> * Rewrite activity lists to fix delete federation (fixes #3625) * Revert "typo and actually have Gamma comment check use gamma, not alpha" This reverts commit 7dfb6ee0f4885da3a2d10316422f5b510772806c. * Revert "Far more robust "Report a comment" test. Many comments about situation, this is currently failing because gamma does not get the report" This reverts commit 7bd3b20ae08a64324029491ddb3ce4295ba16787. * prettier TypeScript * revised comments, as ResolveObject isn't using routine replication * fmt * fix api tests * remove comment --------- Co-authored-by: cetra3 <cetra3@hotmail.com> Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: Felix Ableitner <me@nutomic.com>
177 lines
5.7 KiB
Rust
177 lines
5.7 KiB
Rust
use crate::{
|
|
objects::community::ApubCommunity,
|
|
protocol::{
|
|
activities::{
|
|
block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
|
|
community::{
|
|
announce::{AnnounceActivity, RawAnnouncableActivities},
|
|
collection_add::CollectionAdd,
|
|
collection_remove::CollectionRemove,
|
|
lock_page::{LockPage, UndoLockPage},
|
|
report::Report,
|
|
update::UpdateCommunity,
|
|
},
|
|
create_or_update::{
|
|
chat_message::CreateOrUpdateChatMessage,
|
|
note::CreateOrUpdateNote,
|
|
page::CreateOrUpdatePage,
|
|
},
|
|
deletion::{delete::Delete, delete_user::DeleteUser, undo_delete::UndoDelete},
|
|
following::{accept::AcceptFollow, follow::Follow, undo_follow::UndoFollow},
|
|
voting::{undo_vote::UndoVote, vote::Vote},
|
|
},
|
|
objects::page::Page,
|
|
InCommunity,
|
|
},
|
|
};
|
|
use activitypub_federation::{config::Data, traits::ActivityHandler};
|
|
use lemmy_api_common::context::LemmyContext;
|
|
use lemmy_utils::error::LemmyError;
|
|
use serde::{Deserialize, Serialize};
|
|
use url::Url;
|
|
|
|
/// List of activities which the shared inbox can handle.
|
|
///
|
|
/// This could theoretically be defined as an enum with variants `GroupInboxActivities` and
|
|
/// `PersonInboxActivities`. In practice we need to write it out manually so that priorities
|
|
/// are handled correctly.
|
|
#[derive(Debug, Deserialize, Serialize)]
|
|
#[serde(untagged)]
|
|
#[enum_delegate::implement(ActivityHandler)]
|
|
pub enum SharedInboxActivities {
|
|
Follow(Follow),
|
|
AcceptFollow(AcceptFollow),
|
|
UndoFollow(UndoFollow),
|
|
CreateOrUpdatePrivateMessage(CreateOrUpdateChatMessage),
|
|
Report(Report),
|
|
AnnounceActivity(AnnounceActivity),
|
|
/// This is a catch-all and needs to be last
|
|
RawAnnouncableActivities(RawAnnouncableActivities),
|
|
}
|
|
|
|
/// List of activities which the group inbox can handle.
|
|
#[derive(Debug, Deserialize, Serialize)]
|
|
#[serde(untagged)]
|
|
#[enum_delegate::implement(ActivityHandler)]
|
|
pub enum GroupInboxActivities {
|
|
Follow(Follow),
|
|
UndoFollow(UndoFollow),
|
|
Report(Report),
|
|
/// This is a catch-all and needs to be last
|
|
AnnouncableActivities(RawAnnouncableActivities),
|
|
}
|
|
|
|
/// List of activities which the person inbox can handle.
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
#[serde(untagged)]
|
|
#[enum_delegate::implement(ActivityHandler)]
|
|
pub enum PersonInboxActivities {
|
|
Follow(Follow),
|
|
AcceptFollow(AcceptFollow),
|
|
UndoFollow(UndoFollow),
|
|
CreateOrUpdatePrivateMessage(CreateOrUpdateChatMessage),
|
|
Delete(Delete),
|
|
UndoDelete(UndoDelete),
|
|
AnnounceActivity(AnnounceActivity),
|
|
/// User can also receive some "announcable" activities, eg a comment mention.
|
|
AnnouncableActivities(AnnouncableActivities),
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
#[serde(untagged)]
|
|
#[enum_delegate::implement(ActivityHandler)]
|
|
pub enum AnnouncableActivities {
|
|
CreateOrUpdateComment(CreateOrUpdateNote),
|
|
CreateOrUpdatePost(CreateOrUpdatePage),
|
|
Vote(Vote),
|
|
UndoVote(UndoVote),
|
|
Delete(Delete),
|
|
UndoDelete(UndoDelete),
|
|
UpdateCommunity(UpdateCommunity),
|
|
BlockUser(BlockUser),
|
|
UndoBlockUser(UndoBlockUser),
|
|
CollectionAdd(CollectionAdd),
|
|
CollectionRemove(CollectionRemove),
|
|
LockPost(LockPage),
|
|
UndoLockPost(UndoLockPage),
|
|
// For compatibility with Pleroma/Mastodon (send only)
|
|
Page(Page),
|
|
}
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
#[serde(untagged)]
|
|
#[enum_delegate::implement(ActivityHandler)]
|
|
#[allow(clippy::enum_variant_names)]
|
|
pub enum SiteInboxActivities {
|
|
BlockUser(BlockUser),
|
|
UndoBlockUser(UndoBlockUser),
|
|
DeleteUser(DeleteUser),
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl InCommunity for AnnouncableActivities {
|
|
#[tracing::instrument(skip(self, context))]
|
|
async fn community(&self, context: &Data<LemmyContext>) -> Result<ApubCommunity, LemmyError> {
|
|
use AnnouncableActivities::*;
|
|
match self {
|
|
CreateOrUpdateComment(a) => a.community(context).await,
|
|
CreateOrUpdatePost(a) => a.community(context).await,
|
|
Vote(a) => a.community(context).await,
|
|
UndoVote(a) => a.community(context).await,
|
|
Delete(a) => a.community(context).await,
|
|
UndoDelete(a) => a.community(context).await,
|
|
UpdateCommunity(a) => a.community(context).await,
|
|
BlockUser(a) => a.community(context).await,
|
|
UndoBlockUser(a) => a.community(context).await,
|
|
CollectionAdd(a) => a.community(context).await,
|
|
CollectionRemove(a) => a.community(context).await,
|
|
LockPost(a) => a.community(context).await,
|
|
UndoLockPost(a) => a.community(context).await,
|
|
Page(_) => unimplemented!(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
#![allow(clippy::unwrap_used)]
|
|
#![allow(clippy::indexing_slicing)]
|
|
|
|
use crate::{
|
|
activity_lists::{GroupInboxActivities, PersonInboxActivities, SiteInboxActivities},
|
|
protocol::tests::{test_json, test_parse_lemmy_item},
|
|
};
|
|
|
|
#[test]
|
|
fn test_group_inbox() {
|
|
test_parse_lemmy_item::<GroupInboxActivities>("assets/lemmy/activities/following/follow.json")
|
|
.unwrap();
|
|
test_parse_lemmy_item::<GroupInboxActivities>(
|
|
"assets/lemmy/activities/create_or_update/create_note.json",
|
|
)
|
|
.unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn test_person_inbox() {
|
|
test_parse_lemmy_item::<PersonInboxActivities>("assets/lemmy/activities/following/accept.json")
|
|
.unwrap();
|
|
test_parse_lemmy_item::<PersonInboxActivities>(
|
|
"assets/lemmy/activities/create_or_update/create_note.json",
|
|
)
|
|
.unwrap();
|
|
test_parse_lemmy_item::<PersonInboxActivities>(
|
|
"assets/lemmy/activities/create_or_update/create_private_message.json",
|
|
)
|
|
.unwrap();
|
|
test_json::<PersonInboxActivities>("assets/mastodon/activities/follow.json").unwrap();
|
|
}
|
|
|
|
#[test]
|
|
fn test_site_inbox() {
|
|
test_parse_lemmy_item::<SiteInboxActivities>(
|
|
"assets/lemmy/activities/deletion/delete_user.json",
|
|
)
|
|
.unwrap();
|
|
}
|
|
}
|