Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / apub / src / http / community.rs

diff --git a/crates/apub/src/http/community.rs b/crates/apub/src/http/community.rs
index 9a0d1f02bf1e96fba0eddeb7c3491c6e27e5c1c3..18ad860b0adbd6a626167640a93e0475c32183f9 100644 (file)
--- a/crates/apub/src/http/community.rs
+++ b/crates/apub/src/http/community.rs
@@ -4,25 +4,21 @@ use crate::{
     community_featured::ApubCommunityFeatured,
     community_moderators::ApubCommunityModerators,
     community_outbox::ApubCommunityOutbox,
-    CommunityContext,
   },
-  http::{create_apub_response, create_apub_tombstone_response, receive_lemmy_activity},
-  local_instance,
+  http::{create_apub_response, create_apub_tombstone_response},
   objects::{community::ApubCommunity, person::ApubPerson},
   protocol::collections::group_followers::GroupFollowers,
 };
 use activitypub_federation::{
-  core::object_id::ObjectId,
-  deser::context::WithContext,
-  traits::ApubObject,
-};
-use actix_web::{web, HttpRequest, HttpResponse};
-use lemmy_api_common::{
-  context::LemmyContext,
-  utils::{generate_featured_url, generate_outbox_url},
+  actix_web::inbox::receive_activity,
+  config::Data,
+  protocol::context::WithContext,
+  traits::{Collection, Object},
 };
+use actix_web::{web, web::Bytes, HttpRequest, HttpResponse};
+use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{source::community::Community, traits::ApubActor};
-use lemmy_utils::error::LemmyError;
+use lemmy_utils::error::{LemmyError, LemmyErrorType};
 use serde::Deserialize;
 
 #[derive(Deserialize)]
@@ -34,19 +30,19 @@ pub(crate) struct CommunityQuery {
 #[tracing::instrument(skip_all)]
 pub(crate) async fn get_apub_community_http(
   info: web::Path<CommunityQuery>,
-  context: web::Data<LemmyContext>,
+  context: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
   let community: ApubCommunity =
-    Community::read_from_name(context.pool(), &info.community_name, true)
+    Community::read_from_name(&mut context.pool(), &info.community_name, true)
       .await?
       .into();
 
   if !community.deleted && !community.removed {
-    let apub = community.into_apub(&context).await?;
+    let apub = community.into_json(&context).await?;
 
-    Ok(create_apub_response(&apub))
+    create_apub_response(&apub)
   } else {
-    Ok(create_apub_tombstone_response(community.actor_id.clone()))
+    create_apub_tombstone_response(community.actor_id.clone())
   }
 }
 
@@ -54,76 +50,71 @@ pub(crate) async fn get_apub_community_http(
 #[tracing::instrument(skip_all)]
 pub async fn community_inbox(
   request: HttpRequest,
-  payload: String,
-  context: web::Data<LemmyContext>,
+  body: Bytes,
+  data: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
-  receive_lemmy_activity::<WithContext<GroupInboxActivities>, ApubPerson>(request, payload, context)
-    .await
+  receive_activity::<WithContext<GroupInboxActivities>, ApubPerson, LemmyContext>(
+    request, body, &data,
+  )
+  .await
 }
 
 /// Returns an empty followers collection, only populating the size (for privacy).
 pub(crate) async fn get_apub_community_followers(
   info: web::Path<CommunityQuery>,
-  context: web::Data<LemmyContext>,
+  context: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
-  let community = Community::read_from_name(context.pool(), &info.community_name, false).await?;
+  let community =
+    Community::read_from_name(&mut context.pool(), &info.community_name, false).await?;
   let followers = GroupFollowers::new(community, &context).await?;
-  Ok(create_apub_response(&followers))
+  create_apub_response(&followers)
 }
 
 /// Returns the community outbox, which is populated by a maximum of 20 posts (but no other
 /// activites like votes or comments).
 pub(crate) async fn get_apub_community_outbox(
   info: web::Path<CommunityQuery>,
-  context: web::Data<LemmyContext>,
+  context: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
-  let community = Community::read_from_name(context.pool(), &info.community_name, false).await?;
+  let community: ApubCommunity =
+    Community::read_from_name(&mut context.pool(), &info.community_name, false)
+      .await?
+      .into();
   if community.deleted || community.removed {
-    return Err(LemmyError::from_message("deleted"));
+    return Err(LemmyErrorType::Deleted)?;
   }
-  let id = ObjectId::new(generate_outbox_url(&community.actor_id)?);
-  let outbox_data = CommunityContext(community.into(), context.get_ref().clone());
-  let outbox: ApubCommunityOutbox = id
-    .dereference(&outbox_data, local_instance(&context).await, &mut 0)
-    .await?;
-  Ok(create_apub_response(&outbox.into_apub(&outbox_data).await?))
+  let outbox = ApubCommunityOutbox::read_local(&community, &context).await?;
+  create_apub_response(&outbox)
 }
 
 #[tracing::instrument(skip_all)]
 pub(crate) async fn get_apub_community_moderators(
   info: web::Path<CommunityQuery>,
-  context: web::Data<LemmyContext>,
+  context: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
   let community: ApubCommunity =
-    Community::read_from_name(context.pool(), &info.community_name, false)
+    Community::read_from_name(&mut context.pool(), &info.community_name, false)
       .await?
       .into();
   if community.deleted || community.removed {
-    return Err(LemmyError::from_message("deleted"));
+    return Err(LemmyErrorType::Deleted)?;
   }
-  let id = ObjectId::new(generate_outbox_url(&community.actor_id)?);
-  let outbox_data = CommunityContext(community, context.get_ref().clone());
-  let moderators: ApubCommunityModerators = id
-    .dereference(&outbox_data, local_instance(&context).await, &mut 0)
-    .await?;
-  Ok(create_apub_response(
-    &moderators.into_apub(&outbox_data).await?,
-  ))
+  let moderators = ApubCommunityModerators::read_local(&community, &context).await?;
+  create_apub_response(&moderators)
 }
 
 /// Returns collection of featured (stickied) posts.
 pub(crate) async fn get_apub_community_featured(
   info: web::Path<CommunityQuery>,
-  context: web::Data<LemmyContext>,
+  context: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
-  let community = Community::read_from_name(context.pool(), &info.community_name, false).await?;
+  let community: ApubCommunity =
+    Community::read_from_name(&mut context.pool(), &info.community_name, false)
+      .await?
+      .into();
   if community.deleted || community.removed {
-    return Err(LemmyError::from_message("deleted"));
+    return Err(LemmyErrorType::Deleted)?;
   }
-  let id = ObjectId::new(generate_featured_url(&community.actor_id)?);
-  let data = CommunityContext(community.into(), context.get_ref().clone());
-  let featured: ApubCommunityFeatured = id
-    .dereference(&data, local_instance(&context).await, &mut 0)
-    .await?;
-  Ok(create_apub_response(&featured.into_apub(&data).await?))
+  let featured = ApubCommunityFeatured::read_local(&community, &context).await?;
+  create_apub_response(&featured)
 }