Federate community reports

Cargo.toml

@@ -92,7 +92,7 @@ lemmy_routes = { version = "=1.0.0-alpha.4", path = "./crates/routes" }
 lemmy_db_views = { version = "=1.0.0-alpha.4", path = "./crates/db_views" }
 lemmy_federate = { version = "=1.0.0-alpha.4", path = "./crates/federate" }
 lemmy_email = { version = "=1.0.0-alpha.4", path = "./crates/email" }
-activitypub_federation = { version = "0.6.3", default-features = false, features = [
+activitypub_federation = { version = "0.6.4", default-features = false, features = [
   "actix-web",
 ] }
 diesel = { version = "2.2.7", features = [
@@ -166,6 +166,7 @@ clap = { version = "4.5.29", features = ["derive", "env"] }
 pretty_assertions = "1.4.1"
 derive-new = "0.7.0"
 tuplex = "0.1.2"
+either = "1.15.0"
 
 [dependencies]
 lemmy_api = { workspace = true }

api_tests/src/shared.ts

@@ -80,6 +80,8 @@ import { PostReportResponse } from "lemmy-js-client/dist/types/PostReportRespons
 import { CreatePostReport } from "lemmy-js-client/dist/types/CreatePostReport";
 import { CommentReportResponse } from "lemmy-js-client/dist/types/CommentReportResponse";
 import { CreateCommentReport } from "lemmy-js-client/dist/types/CreateCommentReport";
+import { CommunityReportResponse } from "lemmy-js-client/dist/types/CommunityReportResponse";
+import { CreateCommunityReport } from "lemmy-js-client/dist/types/CreateCommunityReport";
 import { GetPostsResponse } from "lemmy-js-client/dist/types/GetPostsResponse";
 import { GetPosts } from "lemmy-js-client/dist/types/GetPosts";
 import { GetPersonDetailsResponse } from "lemmy-js-client/dist/types/GetPersonDetailsResponse";
@@ -797,6 +799,18 @@ export async function reportPost(
   return api.createPostReport(form);
 }
 
+export async function reportCommunity(
+  api: LemmyHttp,
+  community_id: number,
+  reason: string,
+): Promise<CommunityReportResponse> {
+  let form: CreateCommunityReport = {
+    community_id,
+    reason,
+  };
+  return api.createCommunityReport(form);
+}
+
 export async function listReports(
   api: LemmyHttp,
   show_community_rule_violations: boolean = false,

crates/api/Cargo.toml

@@ -38,6 +38,7 @@ hound = "3.5.1"
 sitemap-rs = "0.2.2"
 totp-rs = { version = "5.6.0", features = ["gen_secret", "otpauth"] }
 diesel-async = { workspace = true, features = ["deadpool", "postgres"] }
+either = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }

crates/api/src/reports/comment_report/create.rs

@@ -1,6 +1,7 @@
 use crate::check_report_reason;
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
+use either::Either;
 use lemmy_api_common::{
   context::LemmyContext,
   reports::comment::{CommentReportResponse, CreateCommentReport},
@@ -75,7 +76,7 @@ pub async fn create_comment_report(
     SendActivityData::CreateReport {
       object_id: comment_view.comment.ap_id.inner().clone(),
       actor: local_user_view.person,
-      community: comment_view.community,
+      receiver: Either::Right(comment_view.community),
       reason: data.reason.clone(),
     },
     &context,

crates/api/src/reports/comment_report/resolve.rs

@@ -1,5 +1,6 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
+use either::Either;
 use lemmy_api_common::{
   context::LemmyContext,
   reports::comment::{CommentReportResponse, ResolveCommentReport},
@@ -44,7 +45,7 @@ pub async fn resolve_comment_report(
       object_id: comment_report_view.comment.ap_id.inner().clone(),
       actor: local_user_view.person,
       report_creator: report.creator,
-      community: comment_report_view.community.clone(),
+      receiver: Either::Right(comment_report_view.community.clone()),
     },
     &context,
   )?;

crates/api/src/reports/community_report/create.rs

@@ -1,14 +1,18 @@
 use crate::check_report_reason;
-use actix_web::web::{Data, Json};
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
+use either::Either;
 use lemmy_api_common::{
   context::LemmyContext,
   reports::community::{CommunityReportResponse, CreateCommunityReport},
+  send_activity::{ActivityChannel, SendActivityData},
   utils::slur_regex,
 };
 use lemmy_db_schema::{
   source::{
     community::Community,
     community_report::{CommunityReport, CommunityReportForm},
+    site::Site,
   },
   traits::{Crud, Reportable},
 };
@@ -28,6 +32,7 @@ pub async fn create_community_report(
   let person_id = local_user_view.person.id;
   let community_id = data.community_id;
   let community = Community::read(&mut context.pool(), community_id).await?;
+  let site = Site::read_from_instance_id(&mut context.pool(), community.instance_id).await?;
 
   let report_form = CommunityReportForm {
     creator_id: person_id,
@@ -61,7 +66,15 @@ pub async fn create_community_report(
     .await?;
   }
 
-  // TODO: consider federating this
+  ActivityChannel::submit_activity(
+    SendActivityData::CreateReport {
+      object_id: community.ap_id.inner().clone(),
+      actor: local_user_view.person,
+      receiver: Either::Left(site),
+      reason: data.reason.clone(),
+    },
+    &context,
+  )?;
 
   Ok(Json(CommunityReportResponse {
     community_report_view,

crates/api/src/reports/community_report/resolve.rs

@@ -1,10 +1,16 @@
-use actix_web::web::{Data, Json};
+use activitypub_federation::config::Data;
+use actix_web::web::Json;
+use either::Either;
 use lemmy_api_common::{
   context::LemmyContext,
   reports::community::{CommunityReportResponse, ResolveCommunityReport},
+  send_activity::{ActivityChannel, SendActivityData},
   utils::is_admin,
 };
-use lemmy_db_schema::{source::community_report::CommunityReport, traits::Reportable};
+use lemmy_db_schema::{
+  source::{community_report::CommunityReport, site::Site},
+  traits::Reportable,
+};
 use lemmy_db_views::structs::{CommunityReportView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
@@ -25,6 +31,21 @@ pub async fn resolve_community_report(
 
   let community_report_view =
     CommunityReportView::read(&mut context.pool(), report_id, person_id).await?;
+  let site = Site::read_from_instance_id(
+    &mut context.pool(),
+    community_report_view.community.instance_id,
+  )
+  .await?;
+
+  ActivityChannel::submit_activity(
+    SendActivityData::SendResolveReport {
+      object_id: community_report_view.community.ap_id.inner().clone(),
+      actor: local_user_view.person,
+      report_creator: community_report_view.creator.clone(),
+      receiver: Either::Left(site),
+    },
+    &context,
+  )?;
 
   Ok(Json(CommunityReportResponse {
     community_report_view,

crates/api/src/reports/post_report/create.rs

@@ -1,6 +1,7 @@
 use crate::check_report_reason;
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
+use either::Either;
 use lemmy_api_common::{
   context::LemmyContext,
   reports::post::{CreatePostReport, PostReportResponse},
@@ -65,7 +66,7 @@ pub async fn create_post_report(
     SendActivityData::CreateReport {
       object_id: post_view.post.ap_id.inner().clone(),
       actor: local_user_view.person,
-      community: post_view.community,
+      receiver: Either::Right(post_view.community),
       reason: data.reason.clone(),
     },
     &context,

crates/api/src/reports/post_report/resolve.rs

@@ -1,5 +1,6 @@
 use activitypub_federation::config::Data;
 use actix_web::web::Json;
+use either::Either;
 use lemmy_api_common::{
   context::LemmyContext,
   reports::post::{PostReportResponse, ResolvePostReport},
@@ -42,7 +43,7 @@ pub async fn resolve_post_report(
       object_id: post_report_view.post.ap_id.inner().clone(),
       actor: local_user_view.person,
       report_creator: report.creator,
-      community: post_report_view.community.clone(),
+      receiver: Either::Right(post_report_view.community.clone()),
     },
     &context,
   )?;

crates/api_common/Cargo.toml

@@ -80,6 +80,7 @@ webmention = { version = "0.6.0", optional = true }
 extism = { git = "https://github.com/extism/extism.git", branch = "pool", optional = true }
 extism-convert = { git = "https://github.com/extism/extism.git", branch = "pool", optional = true }
 once_cell = { version = "1.21.0", optional = true }
+either = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }

crates/api_common/src/send_activity.rs

@@ -1,5 +1,6 @@
 use crate::{community::BanFromCommunity, context::LemmyContext, post::DeletePost};
 use activitypub_federation::config::Data;
+use either::Either;
 use futures::future::BoxFuture;
 use lemmy_db_schema::{
   newtypes::{CommunityId, DbUrl, PersonId},
@@ -9,6 +10,7 @@ use lemmy_db_schema::{
     person::Person,
     post::Post,
     private_message::PrivateMessage,
+    site::Site,
   },
 };
 use lemmy_db_views::structs::PrivateMessageView;
@@ -96,14 +98,14 @@ pub enum SendActivityData {
   CreateReport {
     object_id: Url,
     actor: Person,
-    community: Community,
+    receiver: Either<Site, Community>,
     reason: String,
   },
   SendResolveReport {
     object_id: Url,
     actor: Person,
     report_creator: Person,
-    community: Community,
+    receiver: Either<Site, Community>,
   },
 }
 

crates/apub/Cargo.toml

@@ -46,7 +46,7 @@ html2text = "0.14.0"
 stringreader = "0.1.1"
 enum_delegate = "0.2.0"
 semver = "1.0.25"
-either = "1.15.0"
+either = { workspace = true }
 
 [dev-dependencies]
 serial_test = { workspace = true }

crates/apub/src/activities/community/mod.rs

@@ -1,11 +1,12 @@
 use crate::{
   activities::send_lemmy_activity,
   activity_lists::AnnouncableActivities,
-  fetcher::PostOrComment,
+  fetcher::{PostOrComment, ReportableObjects},
   objects::{community::ApubCommunity, instance::ApubSite, person::ApubPerson},
   protocol::activities::community::announce::AnnounceActivity,
 };
 use activitypub_federation::{config::Data, fetch::object_id::ObjectId, traits::Actor};
+use either::Either;
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{
   source::{
@@ -79,14 +80,14 @@ pub(crate) async fn send_activity_in_community(
 }
 
 async fn report_inboxes(
-  object_id: ObjectId<PostOrComment>,
-  community: &ApubCommunity,
+  object_id: ObjectId<ReportableObjects>,
+  receiver: &Either<ApubSite, ApubCommunity>,
   context: &Data<LemmyContext>,
 ) -> LemmyResult<ActivitySendTargets> {
   // send report to the community where object was posted
-  let mut inboxes = ActivitySendTargets::to_inbox(community.shared_inbox_or_inbox());
+  let mut inboxes = ActivitySendTargets::to_inbox(receiver.shared_inbox_or_inbox());
 
-  if community.local {
+  if let Some(community) = local_community(receiver) {
     // send to all moderators
     let moderators =
       CommunityModeratorView::for_community(&mut context.pool(), community.id).await?;
@@ -96,8 +97,9 @@ async fn report_inboxes(
 
     // also send report to user's home instance if possible
     let object_creator_id = match object_id.dereference_local(context).await? {
-      PostOrComment::Left(p) => p.creator_id,
-      PostOrComment::Right(c) => c.creator_id,
+      ReportableObjects::Left(PostOrComment::Left(p)) => p.creator_id,
+      ReportableObjects::Left(PostOrComment::Right(c)) => c.creator_id,
+      _ => return Ok(inboxes),
     };
     let object_creator = Person::read(&mut context.pool(), object_creator_id).await?;
     let object_creator_site: Option<ApubSite> =
@@ -111,3 +113,10 @@ async fn report_inboxes(
   }
   Ok(inboxes)
 }
+
+fn local_community(site_or_community: &Either<ApubSite, ApubCommunity>) -> Option<&ApubCommunity> {
+  match site_or_community {
+    Either::Right(c) if c.local => Some(c),
+    _ => None,
+  }
+}