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

[lemmy.git] / crates / apub / src / http / comment.rs
diff --git a/crates/apub/src/http/comment.rs b/crates/apub/src/http/comment.rs

index f62ff36e2951378408d7b86df5155a5eb3aa24c8..66794f90c5d1a2bcba7c07bc73ebf4f50b220282 100644 (file)
--- a/crates/apub/src/http/comment.rs
+++ b/crates/apub/src/http/comment.rs
@@ -1,14 +1,12 @@
  use crate::{
-  http::{create_apub_response, create_apub_tombstone_response},
+  http::{create_apub_response, create_apub_tombstone_response, err_object_not_local},
    objects::comment::ApubComment,
  };
-use actix_web::{body::Body, web, web::Path, HttpResponse};
-use diesel::result::Error::NotFound;
-use lemmy_api_common::blocking;
-use lemmy_apub_lib::traits::ApubObject;
+use activitypub_federation::{config::Data, traits::Object};
+use actix_web::{web::Path, HttpResponse};
+use lemmy_api_common::context::LemmyContext;
  use lemmy_db_schema::{newtypes::CommentId, source::comment::Comment, traits::Crud};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::LemmyError;
  use serde::Deserialize;
  
  #[derive(Deserialize)]
@@ -17,21 +15,20 @@ pub(crate) struct CommentQuery {
  }
  
  /// Return the ActivityPub json representation of a local comment over HTTP.
+#[tracing::instrument(skip_all)]
  pub(crate) async fn get_apub_comment(
    info: Path<CommentQuery>,
-  context: web::Data<LemmyContext>,
-) -> Result<HttpResponse<Body>, LemmyError> {
+  context: Data<LemmyContext>,
+) -> Result<HttpResponse, LemmyError> {
    let id = CommentId(info.comment_id.parse::<i32>()?);
-  let comment: ApubComment = blocking(context.pool(), move |conn| Comment::read(conn, id))
-    .await??
-    .into();
+  let comment: ApubComment = Comment::read(&mut context.pool(), id).await?.into();
    if !comment.local {
-    return Err(NotFound.into());
+    return Err(err_object_not_local());
    }
  
-  if !comment.deleted {
-    Ok(create_apub_response(&comment.into_apub(&**context).await?))
+  if !comment.deleted && !comment.removed {
+    create_apub_response(&comment.into_json(&context).await?)
    } else {
-    Ok(create_apub_tombstone_response(&comment.to_tombstone()?))
+    create_apub_tombstone_response(comment.ap_id.clone())
    }
  }