activities::{
block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
community::{
- add_mod::AddMod,
announce::{AnnounceActivity, RawAnnouncableActivities},
- remove_mod::RemoveMod,
+ collection_add::CollectionAdd,
+ collection_remove::CollectionRemove,
+ lock_page::{LockPage, UndoLockPage},
report::Report,
update::UpdateCommunity,
},
InCommunity,
},
};
-use activitypub_federation::{data::Data, deser::context::WithContext, traits::ActivityHandler};
+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 {
- PersonInboxActivities(Box<WithContext<PersonInboxActivities>>),
- GroupInboxActivities(Box<WithContext<GroupInboxActivities>>),
+ 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)]
Follow(Follow),
UndoFollow(UndoFollow),
Report(Report),
- // This is a catch-all and needs to be last
+ /// 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),
-}
-
-/// This is necessary for user inbox, which can also receive some "announcable" activities,
-/// eg a comment mention. This needs to be a separate enum so that announcables received in shared
-/// inbox can fall through to be parsed as GroupInboxActivities::AnnouncableActivities.
-#[derive(Clone, Debug, Deserialize, Serialize)]
-#[serde(untagged)]
-#[enum_delegate::implement(ActivityHandler)]
-pub enum PersonInboxActivitiesWithAnnouncable {
- PersonInboxActivities(Box<PersonInboxActivities>),
- AnnouncableActivities(Box<AnnouncableActivities>),
+ /// User can also receive some "announcable" activities, eg a comment mention.
+ AnnouncableActivities(AnnouncableActivities),
}
#[derive(Clone, Debug, Deserialize, Serialize)]
UpdateCommunity(UpdateCommunity),
BlockUser(BlockUser),
UndoBlockUser(UndoBlockUser),
- AddMod(AddMod),
- RemoveMod(RemoveMod),
+ CollectionAdd(CollectionAdd),
+ CollectionRemove(CollectionRemove),
+ LockPost(LockPage),
+ UndoLockPost(UndoLockPage),
// For compatibility with Pleroma/Mastodon (send only)
Page(Page),
}
DeleteUser(DeleteUser),
}
-#[async_trait::async_trait(?Send)]
+#[async_trait::async_trait]
impl InCommunity for AnnouncableActivities {
#[tracing::instrument(skip(self, context))]
- async fn community(
- &self,
- context: &LemmyContext,
- request_counter: &mut i32,
- ) -> Result<ApubCommunity, LemmyError> {
+ async fn community(&self, context: &Data<LemmyContext>) -> Result<ApubCommunity, LemmyError> {
use AnnouncableActivities::*;
match self {
- CreateOrUpdateComment(a) => a.community(context, request_counter).await,
- CreateOrUpdatePost(a) => a.community(context, request_counter).await,
- Vote(a) => a.community(context, request_counter).await,
- UndoVote(a) => a.community(context, request_counter).await,
- Delete(a) => a.community(context, request_counter).await,
- UndoDelete(a) => a.community(context, request_counter).await,
- UpdateCommunity(a) => a.community(context, request_counter).await,
- BlockUser(a) => a.community(context, request_counter).await,
- UndoBlockUser(a) => a.community(context, request_counter).await,
- AddMod(a) => a.community(context, request_counter).await,
- RemoveMod(a) => a.community(context, request_counter).await,
+ 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,
- PersonInboxActivitiesWithAnnouncable,
- SiteInboxActivities,
- },
- protocol::tests::test_parse_lemmy_item,
+ activity_lists::{GroupInboxActivities, PersonInboxActivities, SiteInboxActivities},
+ protocol::tests::{test_json, test_parse_lemmy_item},
};
#[test]
fn test_person_inbox() {
test_parse_lemmy_item::<PersonInboxActivities>("assets/lemmy/activities/following/accept.json")
.unwrap();
- test_parse_lemmy_item::<PersonInboxActivitiesWithAnnouncable>(
+ test_parse_lemmy_item::<PersonInboxActivities>(
"assets/lemmy/activities/create_or_update/create_note.json",
)
.unwrap();
- test_parse_lemmy_item::<PersonInboxActivitiesWithAnnouncable>(
+ 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]