feat: normalized pagination

src/activitypub/user/following.rs

@@ -3,7 +3,30 @@ use sea_orm::{ColumnTrait, Condition, EntityTrait, PaginatorTrait, QueryFilter,
 
 use crate::{activitypub::{jsonld::LD, JsonLD, Pagination}, activitystream::{object::collection::{page::CollectionPageMut, CollectionMut, CollectionType}, BaseMut, Node}, model, server::Context, url};
 
-pub async fn follow___<const OUTGOING: bool>(
+use model::relation::Column::{Following, Follower};
+
+pub async fn get<const OUTGOING: bool>(
+	State(ctx): State<Context>,
+	Path(id): Path<String>,
+) -> Result<JsonLD<serde_json::Value>, StatusCode> {
+	let follow___ = if OUTGOING { "following" } else { "followers" };
+	let count = model::relation::Entity::find()
+		.filter(Condition::all().add(if OUTGOING { Follower } else { Following }.eq(id.clone())))
+		.count(ctx.db()).await.unwrap_or_else(|e| {
+			tracing::error!("failed counting {follow___} for {id}: {e}");
+			0
+		});
+	Ok(JsonLD(
+		serde_json::Value::new_object()
+			.set_id(Some(&format!("{}/users/{id}/{follow___}", ctx.base())))
+			.set_collection_type(Some(CollectionType::OrderedCollection))
+			.set_total_items(Some(count))
+			.set_first(Node::link(format!("{}/users/{id}/{follow___}/page", ctx.base())))
+			.ld_context()
+	))
+}
+
+pub async fn page<const OUTGOING: bool>(
 	State(ctx): State<Context>,
 	Path(id): Path<String>,
 	Query(page): Query<Pagination>,
@@ -11,48 +34,26 @@ pub async fn follow___<const OUTGOING: bool>(
 	let follow___ = if OUTGOING { "following" } else { "followers" };
 	let limit = page.batch.unwrap_or(20).min(50);
 	let offset = page.offset.unwrap_or(0);
-	if let Some(true) = page.page {
+	match model::relation::Entity::find()
-
+		.filter(Condition::all().add(if OUTGOING { Follower } else { Following }.eq(id.clone())))
-		use model::relation::Column::{Following, Follower};
+		.select_column(if OUTGOING { Following } else { Follower })
-		match model::relation::Entity::find()
+		.limit(limit)
-			.filter(Condition::all().add(if OUTGOING { Follower } else { Following }.eq(id.clone())))
+		.offset(page.offset.unwrap_or(0))
-			.select_column(if OUTGOING { Following } else { Follower })
+		.all(ctx.db()).await
-			.limit(limit)
+	{
-			.offset(page.offset.unwrap_or(0))
+		Err(e) => {
-			.all(ctx.db()).await
+			tracing::error!("error queriying {follow___} for {id}: {e}");
-		{
+			Err(StatusCode::INTERNAL_SERVER_ERROR)
-			Err(e) => {
+		},
-				tracing::error!("error queriying {follow___} for {id}: {e}");
+		Ok(following) => {
-				Err(StatusCode::INTERNAL_SERVER_ERROR)
+			Ok(JsonLD(
-			},
+				serde_json::Value::new_object()
-			Ok(following) => {
+					.set_collection_type(Some(CollectionType::OrderedCollectionPage))
-				Ok(JsonLD(
+					.set_part_of(Node::link(url!(ctx, "/users/{id}/{follow___}")))
-					serde_json::Value::new_object()
+					.set_next(Node::link(url!(ctx, "/users/{id}/{follow___}/page?offset={}", offset+limit)))
-						.set_collection_type(Some(CollectionType::OrderedCollectionPage))
+					.set_ordered_items(Node::array(following.into_iter().map(|x| x.following).collect()))
-						.set_part_of(Node::link(url!(ctx, "/users/{id}/{follow___}")))
+					.ld_context()
-						.set_next(Node::link(url!(ctx, "/users/{id}/{follow___}?page=true&offset={}", offset+limit)))
+			))
-						.set_ordered_items(Node::array(following.into_iter().map(|x| x.following).collect()))
+		},
-						.ld_context()
-				))
-			},
-		}
-
-	} else {
-
-		let count = model::relation::Entity::find()
-			.filter(Condition::all().add(model::relation::Column::Follower.eq(id.clone())))
-			.count(ctx.db()).await.unwrap_or_else(|e| {
-				tracing::error!("failed counting {follow___} for {id}: {e}");
-				0
-			});
-		Ok(JsonLD(
-			serde_json::Value::new_object()
-				.set_id(Some(&format!("{}/users/{id}/{follow___}", ctx.base())))
-				.set_collection_type(Some(CollectionType::OrderedCollection))
-				.set_total_items(Some(count))
-				.set_first(Node::link(format!("{}/users/{id}/{follow___}?page=true", ctx.base())))
-				.ld_context()
-		))
-
 	}
 }

src/activitypub/user/mod.rs

@@ -2,8 +2,7 @@ pub mod inbox;
 
 pub mod outbox;
 
-mod following;
+pub mod following;
-pub use following::follow___;
 
 use axum::{extract::{Path, State}, http::StatusCode};
 use sea_orm::EntityTrait;

src/router.rs

@@ -21,13 +21,16 @@ pub async fn serve(db: DatabaseConnection, domain: String) {
 		.route("/nodeinfo/:version", get(ap::well_known::nodeinfo))
 		// actor routes
 		.route("/users/:id", get(ap::user::view))
-		.route("/users/:id/inbox", get(ap::user::inbox::get))
 		.route("/users/:id/inbox", post(ap::user::inbox::post))
-		.route("/users/:id/outbox", get(ap::user::outbox::get))
+		.route("/users/:id/inbox", get(ap::user::inbox::get))
+		.route("/users/:id/inbox/page", get(ap::user::inbox::page))
 		.route("/users/:id/outbox", post(ap::user::outbox::post))
+		.route("/users/:id/outbox", get(ap::user::outbox::get))
 		.route("/users/:id/outbox/page", get(ap::user::outbox::page))
-		.route("/users/:id/followers", get(ap::user::follow___::<false>))
+		.route("/users/:id/followers", get(ap::user::following::get::<false>))
-		.route("/users/:id/following", get(ap::user::follow___::<true>))
+		.route("/users/:id/followers/page", get(ap::user::following::page::<false>))
+		.route("/users/:id/following", get(ap::user::following::get::<true>))
+		.route("/users/:id/following/page", get(ap::user::following::page::<true>))
 		// specific object routes
 		.route("/activities/:id", get(ap::activity::view))
 		.route("/objects/:id", get(ap::object::view))