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

fix: oops i meant server inbox GET, now it is

Browse source
This commit is contained in:
əlemi 2024-04-23 06:29:52 +02:00
parent 2bf4469270
commit dfbadf5d11
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/routes/activitypub/inbox.rs
View file

@ -2,7 +2,7 @@ use apb::{server::Inbox, Activity, ActivityType};
use axum::{extract::{Query, State}, http::StatusCode, Json}; use axum::{extract::{Query, State}, http::StatusCode, Json};
use sea_orm::{QueryFilter, QuerySelect}; use sea_orm::{QueryFilter, QuerySelect};
use crate::{errors::UpubError, model::{self, addressing::EmbeddedActivity}, server::{auth::{AuthIdentity, Identity}, Context}, url}; use crate::{errors::UpubError, model::{self, addressing::WrappedObject}, server::{auth::{AuthIdentity, Identity}, Context}, url};
use super::{jsonld::LD, JsonLD, Pagination}; use super::{jsonld::LD, JsonLD, Pagination};
@ -20,16 +20,16 @@ pub async fn page(
) -> crate::Result<JsonLD<serde_json::Value>> { ) -> crate::Result<JsonLD<serde_json::Value>> {
let limit = page.batch.unwrap_or(20).min(50); let limit = page.batch.unwrap_or(20).min(50);
let offset = page.offset.unwrap_or(0); let offset = page.offset.unwrap_or(0);
let activities = model::addressing::Entity::find_activities() let objects = model::addressing::Entity::find_objects()
.filter(auth.filter_condition()) .filter(auth.filter_condition())
.limit(limit) .limit(limit)
.offset(offset) .offset(offset)
.into_model::<EmbeddedActivity>() .into_model::<WrappedObject>()
.all(ctx.db()) .all(ctx.db())
.await?; .await?;
let mut out = Vec::new(); let mut out = Vec::new();
for activity in activities { for object in objects {
out.push(activity.ap_filled(ctx.db()).await?); out.push(object.ap_filled(ctx.db()).await?);
} }
Ok(JsonLD( Ok(JsonLD(
ctx.ap_collection_page( ctx.ap_collection_page(