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

feat: server timeline is object-based

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

6
src/routes/activitypub/outbox.rs
View file

@ -1,7 +1,7 @@
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}, routes::activitypub::{jsonld::LD, CreationResult, JsonLD, Pagination}, server::{auth::AuthIdentity, Context}, url}; use crate::{errors::UpubError, model::{self, addressing::WrappedObject}, routes::activitypub::{jsonld::LD, CreationResult, JsonLD, Pagination}, server::{auth::AuthIdentity, Context}, url};
pub async fn get(State(ctx): State<Context>) -> Result<JsonLD<serde_json::Value>, StatusCode> { pub async fn get(State(ctx): State<Context>) -> Result<JsonLD<serde_json::Value>, StatusCode> {
Ok(JsonLD(ctx.ap_collection(&url!(ctx, "/outbox"), None).ld_context())) Ok(JsonLD(ctx.ap_collection(&url!(ctx, "/outbox"), None).ld_context()))
@ -15,12 +15,12 @@ pub async fn page(
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 items = model::addressing::Entity::find_activities() let items = model::addressing::Entity::find_objects()
.filter(auth.filter_condition()) .filter(auth.filter_condition())
// TODO also limit to only local activities // TODO also limit to only local activities
.limit(limit) .limit(limit)
.offset(offset) .offset(offset)
.into_model::<EmbeddedActivity>() .into_model::<WrappedObject>()
.all(ctx.db()).await?; .all(ctx.db()).await?;
let mut out = Vec::new(); let mut out = Vec::new();