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

fix: oops no go back i do it all in fe

Browse source
This commit is contained in:
əlemi 2024-11-09 13:43:27 +01:00
parent 48768b0e1a
commit 4a4625f8e4
Signed by: alemi
GPG key ID: A4895B84D311642C
5 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
upub/routes/src/activitypub/actor/following.rs
View file

@ -120,6 +120,5 @@ pub async fn page<const OUTGOING: bool>(
&upub::url!(ctx, "/actors/{id}/{follow___}/page"),
offset, limit,
following.into_iter().map(serde_json::Value::String).collect(),
true
)
}

2
upub/routes/src/activitypub/actor/notifications.rs
View file

@ -52,6 +52,6 @@ pub async fn page(
.map(|x| x.ap())
.collect();
crate::builders::collection_page(&upub::url!(ctx, "/actors/{id}/notifications/page"), offset, limit, activities, true)
crate::builders::collection_page(&upub::url!(ctx, "/actors/{id}/notifications/page"), offset, limit, activities)
}

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

@ -51,5 +51,5 @@ pub async fn page(
.map(|item| item.ap())
.collect();
crate::builders::collection_page(&id, offset, limit, items, true)
crate::builders::collection_page(&id, offset, limit, items)
}

1
upub/routes/src/activitypub/tags.rs
View file

@ -47,7 +47,6 @@ pub async fn page(
offset,
limit,
objects,
true,
)
}

13
upub/routes/src/builders.rs
View file

@ -21,9 +21,7 @@ pub async fn paginate_feed(
.add(filter);
// by default we want replies because servers don't know about our api and want everything
let replies = page.replies.unwrap_or(true);
if !replies {
if !page.replies.unwrap_or(true) {
conditions = conditions.add(upub::model::object::Column::InReplyTo.is_null());
}
@ -54,19 +52,18 @@ pub async fn paginate_feed(
.map(|item| item.ap())
.collect();
collection_page(&id, offset, limit, items, replies)
collection_page(&id, offset, limit, items)
}
pub fn collection_page(id: &str, offset: u64, limit: u64, items: Vec<serde_json::Value>, replies: bool) -> crate::ApiResult<JsonLD<serde_json::Value>> {
let replies = if replies { "" } else { "&replies=false" };
pub fn collection_page(id: &str, offset: u64, limit: u64, items: Vec<serde_json::Value>) -> crate::ApiResult<JsonLD<serde_json::Value>> {
let next = if items.len() < limit as usize {
apb::Node::Empty
} else {
apb::Node::link(format!("{id}?offset={}{replies}", offset+limit))
apb::Node::link(format!("{id}?offset={}", offset+limit))
};
Ok(JsonLD(
apb::new()
.set_id(Some(&format!("{id}?offset={offset}{replies}")))
.set_id(Some(&format!("{id}?offset={offset}")))
.set_collection_type(Some(apb::CollectionType::OrderedCollectionPage))
.set_part_of(apb::Node::link(id.replace("/page", "")))
.set_ordered_items(apb::Node::array(items))