Remove redundant calls to `Iterator::collect` (#3365)

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

diff --git a/crates/apub/src/activities/community/mod.rs b/crates/apub/src/activities/community/mod.rs
index aed7ddb902714b6e8a7f8c82bec054eb9b6f5527..010bad4f4ee2db7ae914d8339478a4e9b41df553 100644 (file)
--- a/crates/apub/src/activities/community/mod.rs
+++ b/crates/apub/src/activities/community/mod.rs
@@ -1,51 +1,64 @@
 use crate::{
   activities::send_lemmy_activity,
   activity_lists::AnnouncableActivities,
-  local_instance,
-  objects::community::ApubCommunity,
+  objects::{community::ApubCommunity, person::ApubPerson},
   protocol::activities::community::announce::AnnounceActivity,
-  ActorType,
 };
-use activitypub_federation::{core::object_id::ObjectId, traits::Actor};
+use activitypub_federation::{config::Data, traits::Actor};
+use lemmy_api_common::context::LemmyContext;
+use lemmy_db_schema::source::person::PersonFollower;
 use lemmy_utils::error::LemmyError;
-use lemmy_websocket::LemmyContext;
 use url::Url;
 
-pub mod add_mod;
 pub mod announce;
-pub mod remove_mod;
+pub mod collection_add;
+pub mod collection_remove;
+pub mod lock_page;
 pub mod report;
 pub mod update;
 
-#[tracing::instrument(skip_all)]
-pub(crate) async fn send_activity_in_community<ActorT>(
+/// This function sends all activities which are happening in a community to the right inboxes.
+/// For example Create/Page, Add/Mod etc, but not private messages.
+///
+/// Activities are sent to the community itself if it lives on another instance. If the community
+/// is local, the activity is directly wrapped into Announce and sent to community followers.
+/// Activities are also sent to those who follow the actor (with exception of moderation activities).
+///
+/// * `activity` - The activity which is being sent
+/// * `actor` - The user who is sending the activity
+/// * `community` - Community inside which the activity is sent
+/// * `inboxes` - Any additional inboxes the activity should be sent to (for example,
+///               to the user who is being promoted to moderator)
+/// * `is_mod_activity` - True for things like Add/Mod, these are not sent to user followers
+pub(crate) async fn send_activity_in_community(
   activity: AnnouncableActivities,
-  actor: &ActorT,
+  actor: &ApubPerson,
   community: &ApubCommunity,
-  mut inboxes: Vec<Url>,
-  context: &LemmyContext,
-) -> Result<(), LemmyError>
-where
-  ActorT: Actor + ActorType,
-{
-  inboxes.push(community.shared_inbox_or_inbox());
-  send_lemmy_activity(context, activity.clone(), actor, inboxes, false).await?;
+  extra_inboxes: Vec<Url>,
+  is_mod_action: bool,
+  context: &Data<LemmyContext>,
+) -> Result<(), LemmyError> {
+  // send to any users which are mentioned or affected directly
+  let mut inboxes = extra_inboxes;
+
+  // send to user followers
+  if !is_mod_action {
+    inboxes.extend(
+      &mut PersonFollower::list_followers(context.pool(), actor.id)
+        .await?
+        .into_iter()
+        .map(|p| ApubPerson(p).shared_inbox_or_inbox()),
+    );
+  }
 
   if community.local {
-    AnnounceActivity::send(activity.try_into()?, community, context).await?;
+    // send directly to community followers
+    AnnounceActivity::send(activity.clone().try_into()?, community, context).await?;
+  } else {
+    // send to the community, which will then forward to followers
+    inboxes.push(community.shared_inbox_or_inbox());
   }
 
+  send_lemmy_activity(context, activity.clone(), actor, inboxes, false).await?;
   Ok(())
 }
-
-#[tracing::instrument(skip_all)]
-async fn get_community_from_moderators_url(
-  moderators: &Url,
-  context: &LemmyContext,
-  request_counter: &mut i32,
-) -> Result<ApubCommunity, LemmyError> {
-  let community_id = Url::parse(&moderators.to_string().replace("/moderators", ""))?;
-  ObjectId::new(community_id)
-    .dereference(context, local_instance(context).await, request_counter)
-    .await
-}