zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

feat: activity view embeds object

Browse source
This commit is contained in:
əlemi 2024-03-21 01:42:29 +01:00
parent 399061eff0
commit fe36ed2a52
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/activitypub/activity.rs
View file

@ -1,12 +1,15 @@
use axum::{extract::{Path, State}, http::StatusCode, Json}; use axum::{extract::{Path, State}, http::StatusCode, Json};
use sea_orm::EntityTrait; use sea_orm::EntityTrait;
use crate::{activitystream::{prelude::*, Node}, model::{activity, object}, server::Context};
use crate::{activitystream::Base, model::activity, server::Context};
pub async fn view(State(ctx) : State<Context>, Path(id): Path<String>) -> Result<Json<serde_json::Value>, StatusCode> { pub async fn view(State(ctx) : State<Context>, Path(id): Path<String>) -> Result<Json<serde_json::Value>, StatusCode> {
match activity::Entity::find_by_id(ctx.aid(id)).one(ctx.db()).await { match activity::Entity::find_by_id(ctx.aid(id))
Ok(Some(activity)) => Ok(Json(activity.underlying_json_object())), .find_also_related(object::Entity)
.one(ctx.db())
.await
{
Ok(Some((activity, object))) => Ok(Json(activity.underlying_json_object().set_object(Node::maybe_object(object)))),
Ok(None) => Err(StatusCode::NOT_FOUND), Ok(None) => Err(StatusCode::NOT_FOUND),
Err(e) => { Err(e) => {
tracing::error!("error querying for activity: {e}"); tracing::error!("error querying for activity: {e}");