alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: dont use builders for context

Browse source
This commit is contained in:
əlemi 2024-08-13 20:32:49 +02:00
parent 100c738336
commit 9b6b51889a
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
upub/routes/src/activitypub/object/context.rs
View file

@ -1,6 +1,6 @@
use axum::extract::{Path, Query, State}; use axum::extract::{Path, Query, State};
use sea_orm::{ColumnTrait, Condition, PaginatorTrait, QueryFilter}; use sea_orm::{ColumnTrait, Condition, PaginatorTrait, QueryFilter, QuerySelect};
use upub::{model, Context}; use upub::{model, selector::{BatchFillable, RichActivity}, Context};
use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity, Identity}; use crate::{activitypub::Pagination, builders::JsonLD, AuthIdentity, Identity};
@ -39,14 +39,29 @@ pub async fn page(
.add(model::object::Column::Context.eq(context)) .add(model::object::Column::Context.eq(context))
.add(filter); .add(filter);
let limit = page.batch.unwrap_or(20).min(50);
let offset = page.offset.unwrap_or(0);
crate::builders::paginate_feed(
upub::url!(ctx, "/objects/{id}/context/page"), let items = upub::Query::feed(auth.my_id(), true)
filter, .filter(filter)
ctx.db(), // TODO also limit to only local activities
page, .limit(limit)
auth.my_id(), .offset(offset)
false, .into_model::<RichActivity>()
) .all(ctx.db())
.await .await?
.with_batched::<upub::model::attachment::Entity>(ctx.db())
.await?
.with_batched::<upub::model::mention::Entity>(ctx.db())
.await?
.with_batched::<upub::model::hashtag::Entity>(ctx.db())
.await?;
let items : Vec<serde_json::Value> = items
.into_iter()
.map(|item| item.ap())
.collect();
crate::builders::collection_page(&id, offset, limit, items)
} }