use crate::{
activities::{
- community::{
- announce::{AnnouncableActivities, GetCommunity},
- block_user::BlockUserFromCommunity,
- send_to_community,
- },
+ community::{announce::GetCommunity, send_activity_in_community},
generate_activity_id,
verify_activity,
verify_is_public,
verify_mod_action,
verify_person_in_community,
},
- context::lemmy_context,
- fetcher::object_id::ObjectId,
+ activity_lists::AnnouncableActivities,
objects::{community::ApubCommunity, person::ApubPerson},
+ protocol::activities::community::{
+ block_user::BlockUserFromCommunity,
+ undo_block_user::UndoBlockUserFromCommunity,
+ },
};
-use activitystreams::{
- activity::kind::UndoType,
- base::AnyBase,
- primitives::OneOrMany,
- public,
- unparsed::Unparsed,
-};
+use activitystreams_kinds::{activity::UndoType, public};
use lemmy_api_common::blocking;
use lemmy_apub_lib::{
data::Data,
- traits::{ActivityFields, ActivityHandler, ActorType},
+ object_id::ObjectId,
+ traits::{ActivityHandler, ActorType},
};
use lemmy_db_schema::{
source::community::{CommunityPersonBan, CommunityPersonBanForm},
};
use lemmy_utils::LemmyError;
use lemmy_websocket::LemmyContext;
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
-#[serde(rename_all = "camelCase")]
-pub struct UndoBlockUserFromCommunity {
- actor: ObjectId<ApubPerson>,
- to: Vec<Url>,
- object: BlockUserFromCommunity,
- cc: [ObjectId<ApubCommunity>; 1],
- #[serde(rename = "type")]
- kind: UndoType,
- id: Url,
- #[serde(rename = "@context")]
- context: OneOrMany<AnyBase>,
- #[serde(flatten)]
- unparsed: Unparsed,
-}
impl UndoBlockUserFromCommunity {
+ #[tracing::instrument(skip_all)]
pub async fn send(
community: &ApubCommunity,
target: &ApubPerson,
actor: &ApubPerson,
context: &LemmyContext,
) -> Result<(), LemmyError> {
- let block = BlockUserFromCommunity::new(community, target, actor, context)?;
+ let block = BlockUserFromCommunity::new(community, target, actor, None, context)?;
let id = generate_activity_id(
UndoType::Undo,
actor: ObjectId::new(actor.actor_id()),
to: vec![public()],
object: block,
- cc: [ObjectId::new(community.actor_id())],
+ cc: vec![community.actor_id()],
kind: UndoType::Undo,
id: id.clone(),
- context: lemmy_context(),
unparsed: Default::default(),
};
let activity = AnnouncableActivities::UndoBlockUserFromCommunity(undo);
let inboxes = vec![target.shared_inbox_or_inbox_url()];
- send_to_community(activity, &id, actor, community, inboxes, context).await
+ send_activity_in_community(activity, &id, actor, community, inboxes, context).await
}
}
#[async_trait::async_trait(?Send)]
impl ActivityHandler for UndoBlockUserFromCommunity {
type DataType = LemmyContext;
+
+ #[tracing::instrument(skip_all)]
async fn verify(
&self,
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_is_public(&self.to)?;
- verify_activity(self, &context.settings())?;
+ verify_is_public(&self.to, &self.cc)?;
+ verify_activity(&self.id, self.actor.inner(), &context.settings())?;
let community = self.get_community(context, request_counter).await?;
verify_person_in_community(&self.actor, &community, context, request_counter).await?;
- verify_mod_action(&self.actor, &self.cc[0], context, request_counter).await?;
+ verify_mod_action(&self.actor, &community, context, request_counter).await?;
self.object.verify(context, request_counter).await?;
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn receive(
self,
context: &Data<LemmyContext>,
let blocked_user = self
.object
.object
- .dereference(context, request_counter)
+ .dereference(context, context.client(), request_counter)
.await?;
let community_user_ban_form = CommunityPersonBanForm {
community_id: community.id,
person_id: blocked_user.id,
+ expires: None,
};
blocking(context.pool(), move |conn: &'_ _| {
#[async_trait::async_trait(?Send)]
impl GetCommunity for UndoBlockUserFromCommunity {
+ #[tracing::instrument(skip_all)]
async fn get_community(
&self,
context: &LemmyContext,