use crate::{
activities::{
- community::announce::AnnouncableActivities,
+ community::{announce::GetCommunity, send_activity_in_community},
generate_activity_id,
verify_activity,
+ verify_is_public,
verify_mod_action,
verify_person_in_community,
},
- activity_queue::send_to_community_new,
- extensions::context::lemmy_context,
- fetcher::object_id::ObjectId,
- ActorType,
-};
-use activitystreams::{
- activity::kind::BlockType,
- base::AnyBase,
- primitives::OneOrMany,
- unparsed::Unparsed,
+ activity_lists::AnnouncableActivities,
+ objects::{community::ApubCommunity, person::ApubPerson},
+ protocol::activities::community::block_user::BlockUserFromCommunity,
};
+use activitystreams_kinds::{activity::BlockType, public};
+use chrono::NaiveDateTime;
use lemmy_api_common::blocking;
-use lemmy_apub_lib::{values::PublicUrl, ActivityFields, ActivityHandler};
-use lemmy_db_queries::{Bannable, Followable};
-use lemmy_db_schema::source::{
- community::{
- Community,
+use lemmy_apub_lib::{
+ data::Data,
+ object_id::ObjectId,
+ traits::{ActivityHandler, ActorType},
+};
+use lemmy_db_schema::{
+ source::community::{
CommunityFollower,
CommunityFollowerForm,
CommunityPersonBan,
CommunityPersonBanForm,
},
- person::Person,
+ traits::{Bannable, Followable},
};
-use lemmy_utils::LemmyError;
+use lemmy_utils::{utils::convert_datetime, LemmyError};
use lemmy_websocket::LemmyContext;
-use serde::{Deserialize, Serialize};
-use url::Url;
-
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
-#[serde(rename_all = "camelCase")]
-pub struct BlockUserFromCommunity {
- actor: ObjectId<Person>,
- to: [PublicUrl; 1],
- pub(in crate::activities::community) object: ObjectId<Person>,
- cc: [ObjectId<Community>; 1],
- #[serde(rename = "type")]
- kind: BlockType,
- id: Url,
- #[serde(rename = "@context")]
- context: OneOrMany<AnyBase>,
- #[serde(flatten)]
- unparsed: Unparsed,
-}
impl BlockUserFromCommunity {
pub(in crate::activities::community) fn new(
- community: &Community,
- target: &Person,
- actor: &Person,
+ community: &ApubCommunity,
+ target: &ApubPerson,
+ actor: &ApubPerson,
+ expires: Option<NaiveDateTime>,
context: &LemmyContext,
) -> Result<BlockUserFromCommunity, LemmyError> {
Ok(BlockUserFromCommunity {
actor: ObjectId::new(actor.actor_id()),
- to: [PublicUrl::Public],
+ to: vec![public()],
object: ObjectId::new(target.actor_id()),
- cc: [ObjectId::new(community.actor_id())],
+ cc: vec![community.actor_id()],
+ target: ObjectId::new(community.actor_id()),
kind: BlockType::Block,
id: generate_activity_id(
BlockType::Block,
&context.settings().get_protocol_and_hostname(),
)?,
- context: lemmy_context(),
+ expires: expires.map(convert_datetime),
unparsed: Default::default(),
})
}
+ #[tracing::instrument(skip_all)]
pub async fn send(
- community: &Community,
- target: &Person,
- actor: &Person,
+ community: &ApubCommunity,
+ target: &ApubPerson,
+ actor: &ApubPerson,
+ expires: Option<NaiveDateTime>,
context: &LemmyContext,
) -> Result<(), LemmyError> {
- let block = BlockUserFromCommunity::new(community, target, actor, context)?;
+ let block = BlockUserFromCommunity::new(community, target, actor, expires, context)?;
let block_id = block.id.clone();
let activity = AnnouncableActivities::BlockUserFromCommunity(block);
- let inboxes = vec![target.get_shared_inbox_or_inbox_url()];
- send_to_community_new(activity, &block_id, actor, community, inboxes, context).await
+ let inboxes = vec![target.shared_inbox_or_inbox_url()];
+ send_activity_in_community(activity, &block_id, actor, community, inboxes, context).await
}
}
#[async_trait::async_trait(?Send)]
impl ActivityHandler for BlockUserFromCommunity {
+ type DataType = LemmyContext;
+
+ #[tracing::instrument(skip_all)]
async fn verify(
&self,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- verify_activity(self, &context.settings())?;
- verify_person_in_community(&self.actor, &self.cc[0], context, request_counter).await?;
- verify_mod_action(&self.actor, self.cc[0].clone(), context).await?;
+ 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, &community, context, request_counter).await?;
Ok(())
}
+ #[tracing::instrument(skip_all)]
async fn receive(
self,
- context: &LemmyContext,
+ context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let community = self.cc[0].dereference(context, request_counter).await?;
- let blocked_user = self.object.dereference(context, request_counter).await?;
+ let community = self.get_community(context, request_counter).await?;
+ let blocked_user = self
+ .object
+ .dereference(context, context.client(), request_counter)
+ .await?;
let community_user_ban_form = CommunityPersonBanForm {
community_id: community.id,
person_id: blocked_user.id,
+ expires: Some(self.expires.map(|u| u.naive_local())),
};
blocking(context.pool(), move |conn: &'_ _| {
Ok(())
}
}
+
+#[async_trait::async_trait(?Send)]
+impl GetCommunity for BlockUserFromCommunity {
+ #[tracing::instrument(skip_all)]
+ async fn get_community(
+ &self,
+ context: &LemmyContext,
+ request_counter: &mut i32,
+ ) -> Result<ApubCommunity, LemmyError> {
+ self
+ .target
+ .dereference(context, context.client(), request_counter)
+ .await
+ }
+}