use crate::{
- http::{create_apub_response, create_apub_tombstone_response},
+ http::{create_apub_response, create_apub_tombstone_response, err_object_not_local},
objects::post::ApubPost,
};
-use actix_web::{body::Body, web, 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, HttpResponse};
+use lemmy_api_common::context::LemmyContext;
use lemmy_db_schema::{newtypes::PostId, source::post::Post, traits::Crud};
-use lemmy_utils::LemmyError;
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::LemmyError;
use serde::Deserialize;
#[derive(Deserialize)]
}
/// Return the ActivityPub json representation of a local post over HTTP.
+#[tracing::instrument(skip_all)]
pub(crate) async fn get_apub_post(
info: web::Path<PostQuery>,
- context: web::Data<LemmyContext>,
-) -> Result<HttpResponse<Body>, LemmyError> {
+ context: Data<LemmyContext>,
+) -> Result<HttpResponse, LemmyError> {
let id = PostId(info.post_id.parse::<i32>()?);
- let post: ApubPost = blocking(context.pool(), move |conn| Post::read(conn, id))
- .await??
- .into();
+ let post: ApubPost = Post::read(&mut context.pool(), id).await?.into();
if !post.local {
- return Err(NotFound.into());
+ return Err(err_object_not_local());
}
- if !post.deleted {
- Ok(create_apub_response(&post.into_apub(&context).await?))
+ if !post.deleted && !post.removed {
+ create_apub_response(&post.into_json(&context).await?)
} else {
- Ok(create_apub_tombstone_response(&post.to_tombstone()?))
+ create_apub_tombstone_response(post.ap_id.clone())
}
}