Adding temporary bans. Fixes #1423 (#1999)

[lemmy.git] / crates / apub / src / activities / community / block_user.rs

diff --git a/crates/apub/src/activities/community/block_user.rs b/crates/apub/src/activities/community/block_user.rs
index bf362c4827a45a9a0445c54a72f6998ab3ea76c1..f5a6f02cebfdf54ce5653a72ec4b1b674c7cb5df 100644 (file)
--- a/crates/apub/src/activities/community/block_user.rs
+++ b/crates/apub/src/activities/community/block_user.rs
@@ -1,59 +1,111 @@
 use crate::{
-  activities::{verify_activity, verify_mod_action, verify_person_in_community},
-  fetcher::{community::get_or_fetch_and_upsert_community, person::get_or_fetch_and_upsert_person},
+  activities::{
+    community::{announce::GetCommunity, send_activity_in_community},
+    generate_activity_id,
+    verify_activity,
+    verify_is_public,
+    verify_mod_action,
+    verify_person_in_community,
+  },
+  activity_lists::AnnouncableActivities,
+  objects::{community::ApubCommunity, person::ApubPerson},
+  protocol::activities::community::block_user::BlockUserFromCommunity,
 };
-use activitystreams::activity::kind::BlockType;
+use activitystreams_kinds::{activity::BlockType, public};
+use chrono::NaiveDateTime;
 use lemmy_api_common::blocking;
-use lemmy_apub_lib::{values::PublicUrl, ActivityCommonFields, ActivityHandler};
-use lemmy_db_queries::{Bannable, Followable};
-use lemmy_db_schema::source::community::{
-  CommunityFollower,
-  CommunityFollowerForm,
-  CommunityPersonBan,
-  CommunityPersonBanForm,
+use lemmy_apub_lib::{
+  data::Data,
+  object_id::ObjectId,
+  traits::{ActivityHandler, ActorType},
 };
-use lemmy_utils::LemmyError;
+use lemmy_db_schema::{
+  source::community::{
+    CommunityFollower,
+    CommunityFollowerForm,
+    CommunityPersonBan,
+    CommunityPersonBanForm,
+  },
+  traits::{Bannable, Followable},
+};
+use lemmy_utils::{utils::convert_datetime, LemmyError};
 use lemmy_websocket::LemmyContext;
-use url::Url;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct BlockUserFromCommunity {
-  to: PublicUrl,
-  pub(in crate::activities::community) object: Url,
-  cc: [Url; 1],
-  #[serde(rename = "type")]
-  kind: BlockType,
-  #[serde(flatten)]
-  common: ActivityCommonFields,
+impl BlockUserFromCommunity {
+  pub(in crate::activities::community) fn new(
+    community: &ApubCommunity,
+    target: &ApubPerson,
+    actor: &ApubPerson,
+    expires: Option<NaiveDateTime>,
+    context: &LemmyContext,
+  ) -> Result<BlockUserFromCommunity, LemmyError> {
+    Ok(BlockUserFromCommunity {
+      actor: ObjectId::new(actor.actor_id()),
+      to: vec![public()],
+      object: ObjectId::new(target.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(),
+      )?,
+      expires: expires.map(convert_datetime),
+      unparsed: Default::default(),
+    })
+  }
+
+  #[tracing::instrument(skip_all)]
+  pub async fn send(
+    community: &ApubCommunity,
+    target: &ApubPerson,
+    actor: &ApubPerson,
+    expires: Option<NaiveDateTime>,
+    context: &LemmyContext,
+  ) -> Result<(), LemmyError> {
+    let block = BlockUserFromCommunity::new(community, target, actor, expires, context)?;
+    let block_id = block.id.clone();
+
+    let activity = AnnouncableActivities::BlockUserFromCommunity(block);
+    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.common())?;
-    verify_person_in_community(&self.common.actor, &self.cc[0], context, request_counter).await?;
-    verify_mod_action(&self.common.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 =
-      get_or_fetch_and_upsert_community(&self.cc[0], context, request_counter).await?;
-    let blocked_user =
-      get_or_fetch_and_upsert_person(&self.object, 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: &'_ _| {
@@ -75,8 +127,19 @@ impl ActivityHandler for BlockUserFromCommunity {
 
     Ok(())
   }
+}
 
-  fn common(&self) -> &ActivityCommonFields {
-    &self.common
+#[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
   }
 }