use crate::{
- http::{create_apub_response, create_apub_tombstone_response},
- objects::ToApub,
+ 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_structs::blocking;
-use lemmy_db_queries::Crud;
-use lemmy_db_schema::source::comment::Comment;
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+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::error::LemmyError;
use serde::Deserialize;
#[derive(Deserialize)]
-pub struct CommentQuery {
+pub(crate) struct CommentQuery {
comment_id: String,
}
/// Return the ActivityPub json representation of a local comment over HTTP.
-pub async fn get_apub_comment(
+#[tracing::instrument(skip_all)]
+pub(crate) async fn get_apub_comment(
info: Path<CommentQuery>,
- context: web::Data<LemmyContext>,
-) -> Result<HttpResponse<Body>, LemmyError> {
- let id = info.comment_id.parse::<i32>()?;
- let comment = blocking(context.pool(), move |conn| Comment::read(conn, id)).await??;
+ context: Data<LemmyContext>,
+) -> Result<HttpResponse, LemmyError> {
+ let id = CommentId(info.comment_id.parse::<i32>()?);
+ 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.to_apub(context.pool()).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())
}
}