Fix case in activitypub context (ref #2734) (#2743)

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

diff --git a/crates/apub/src/activities/community/remove_mod.rs b/crates/apub/src/activities/community/remove_mod.rs
index b6a565f1f72bd744e2d0603e44bec8ac1b7f99a5..9bd8c4ec2b152efc5adb07cc0472a10455df2346 100644 (file)
--- a/crates/apub/src/activities/community/remove_mod.rs
+++ b/crates/apub/src/activities/community/remove_mod.rs
@@ -1,35 +1,34 @@
 use crate::{
   activities::{
-    community::{
-      announce::GetCommunity,
-      get_community_from_moderators_url,
-      send_activity_in_community,
-    },
+    community::send_activity_in_community,
     generate_activity_id,
-    verify_activity,
     verify_add_remove_moderator_target,
     verify_is_public,
     verify_mod_action,
     verify_person_in_community,
   },
   activity_lists::AnnouncableActivities,
-  generate_moderators_url,
+  local_instance,
   objects::{community::ApubCommunity, person::ApubPerson},
-  protocol::activities::community::remove_mod::RemoveMod,
+  protocol::{activities::community::remove_mod::RemoveMod, InCommunity},
+  ActorType,
 };
-use activitystreams_kinds::{activity::RemoveType, public};
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::{
+use activitypub_federation::{
+  core::object_id::ObjectId,
   data::Data,
-  object_id::ObjectId,
-  traits::{ActivityHandler, ActorType},
+  traits::{ActivityHandler, Actor},
 };
+use activitystreams_kinds::{activity::RemoveType, public};
+use lemmy_api_common::{context::LemmyContext, utils::generate_moderators_url};
 use lemmy_db_schema::{
-  source::community::{CommunityModerator, CommunityModeratorForm},
-  traits::Joinable,
+  source::{
+    community::{CommunityModerator, CommunityModeratorForm},
+    moderator::{ModAddCommunity, ModAddCommunityForm},
+  },
+  traits::{Crud, Joinable},
 };
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::LemmyError;
+use url::Url;
 
 impl RemoveMod {
   #[tracing::instrument(skip_all)]
@@ -51,18 +50,27 @@ impl RemoveMod {
       id: id.clone(),
       cc: vec![community.actor_id()],
       kind: RemoveType::Remove,
-      unparsed: Default::default(),
+      audience: Some(ObjectId::new(community.actor_id())),
     };
 
     let activity = AnnouncableActivities::RemoveMod(remove);
-    let inboxes = vec![removed_mod.shared_inbox_or_inbox_url()];
-    send_activity_in_community(activity, &id, actor, community, inboxes, context).await
+    let inboxes = vec![removed_mod.shared_inbox_or_inbox()];
+    send_activity_in_community(activity, actor, community, inboxes, true, context).await
   }
 }
 
 #[async_trait::async_trait(?Send)]
 impl ActivityHandler for RemoveMod {
   type DataType = LemmyContext;
+  type Error = LemmyError;
+
+  fn id(&self) -> &Url {
+    &self.id
+  }
+
+  fn actor(&self) -> &Url {
+    self.actor.inner()
+  }
 
   #[tracing::instrument(skip_all)]
   async fn verify(
@@ -71,10 +79,16 @@ impl ActivityHandler for RemoveMod {
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
     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?;
+    let community = self.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?;
+    verify_mod_action(
+      &self.actor,
+      self.object.inner(),
+      community.id,
+      context,
+      request_counter,
+    )
+    .await?;
     verify_add_remove_moderator_target(&self.target, &community)?;
     Ok(())
   }
@@ -85,30 +99,32 @@ impl ActivityHandler for RemoveMod {
     context: &Data<LemmyContext>,
     request_counter: &mut i32,
   ) -> Result<(), LemmyError> {
-    let community = self.get_community(context, request_counter).await?;
-    let remove_mod = self.object.dereference(context, request_counter).await?;
+    let community = self.community(context, request_counter).await?;
+    let remove_mod = self
+      .object
+      .dereference(context, local_instance(context).await, request_counter)
+      .await?;
 
     let form = CommunityModeratorForm {
       community_id: community.id,
       person_id: remove_mod.id,
     };
-    blocking(context.pool(), move |conn| {
-      CommunityModerator::leave(conn, &form)
-    })
-    .await??;
+    CommunityModerator::leave(context.pool(), &form).await?;
+
+    // write mod log
+    let actor = self
+      .actor
+      .dereference(context, local_instance(context).await, request_counter)
+      .await?;
+    let form = ModAddCommunityForm {
+      mod_person_id: actor.id,
+      other_person_id: remove_mod.id,
+      community_id: community.id,
+      removed: Some(true),
+    };
+    ModAddCommunity::create(context.pool(), &form).await?;
+
     // TODO: send websocket notification about removed mod
     Ok(())
   }
 }
-
-#[async_trait::async_trait(?Send)]
-impl GetCommunity for RemoveMod {
-  #[tracing::instrument(skip_all)]
-  async fn get_community(
-    &self,
-    context: &LemmyContext,
-    request_counter: &mut i32,
-  ) -> Result<ApubCommunity, LemmyError> {
-    get_community_from_moderators_url(&self.target, context, request_counter).await
-  }
-}