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

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

diff --git a/crates/apub/src/http/post.rs b/crates/apub/src/http/post.rs
index fc164a549c70e5a2d76c066972bc51f169c1e104..4da3dc14ffaa5207f1ce9027a3fd06058d9669d7 100644 (file)
--- a/crates/apub/src/http/post.rs
+++ b/crates/apub/src/http/post.rs
@@ -2,7 +2,7 @@ use crate::{
   http::{create_apub_response, create_apub_tombstone_response, err_object_not_local},
   objects::post::ApubPost,
 };
-use activitypub_federation::traits::ApubObject;
+use activitypub_federation::{config::Data, traits::Object};
 use actix_web::{web, HttpResponse};
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{newtypes::PostId, source::post::Post, traits::Crud};
@@ -18,17 +18,17 @@ pub(crate) struct PostQuery {
 #[tracing::instrument(skip_all)]
 pub(crate) async fn get_apub_post(
   info: web::Path<PostQuery>,
-  context: web::Data<LemmyContext>,
+  context: Data<LemmyContext>,
 ) -> Result<HttpResponse, LemmyError> {
   let id = PostId(info.post_id.parse::<i32>()?);
-  let post: ApubPost = Post::read(context.pool(), id).await?.into();
+  let post: ApubPost = Post::read(&mut context.pool(), id).await?.into();
   if !post.local {
     return Err(err_object_not_local());
   }
 
   if !post.deleted && !post.removed {
-    Ok(create_apub_response(&post.into_apub(&context).await?))
+    create_apub_response(&post.into_json(&context).await?)
   } else {
-    Ok(create_apub_tombstone_response(post.ap_id.clone()))
+    create_apub_tombstone_response(post.ap_id.clone())
   }
 }