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

fix: object view

Browse source 
quite wasteful to do it like this but for some reason previous way
didn't work??
This commit is contained in:
əlemi 2024-04-13 03:28:30 +02:00
parent bb16a5b7d2
commit c342b7c936
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/routes/activitypub/object.rs
View file

@ -2,7 +2,7 @@ use axum::{extract::{Path, State}, http::StatusCode};
use sea_orm::{ColumnTrait, QueryFilter}; use sea_orm::{ColumnTrait, QueryFilter};
use apb::{ObjectMut, BaseMut, Node}; use apb::{ObjectMut, BaseMut, Node};
use crate::{model, server::{auth::AuthIdentity, Context}}; use crate::{model::{self, addressing::EmbeddedActivity}, server::{auth::AuthIdentity, Context}};
use super::{jsonld::LD, JsonLD}; use super::{jsonld::LD, JsonLD};
@ -28,14 +28,15 @@ pub async fn view(
Path(id): Path<String>, Path(id): Path<String>,
AuthIdentity(auth): AuthIdentity, AuthIdentity(auth): AuthIdentity,
) -> Result<JsonLD<serde_json::Value>, StatusCode> { ) -> Result<JsonLD<serde_json::Value>, StatusCode> {
match model::addressing::Entity::find_objects() match model::addressing::Entity::find_activities()
.filter(model::object::Column::Id.eq(ctx.oid(id))) .filter(model::object::Column::Id.eq(ctx.oid(id)))
.filter(auth.filter_condition()) .filter(auth.filter_condition())
.into_model::<model::object::Model>() .into_model::<EmbeddedActivity>()
.one(ctx.db()) .one(ctx.db())
.await .await
{ {
Ok(Some(object)) => Ok(JsonLD(ap_object(object).ld_context())), Ok(Some(EmbeddedActivity { activity: _, object: Some(object) })) => Ok(JsonLD(ap_object(object).ld_context())),
Ok(Some(EmbeddedActivity { activity: _, object: None })) => Err(StatusCode::NOT_FOUND),
Ok(None) => Err(StatusCode::NOT_FOUND), Ok(None) => Err(StatusCode::NOT_FOUND),
Err(e) => { Err(e) => {
tracing::error!("error querying for object: {e}"); tracing::error!("error querying for object: {e}");