From 95ab7a50ef2578918e9c6942937f39679d862b61 Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Fri, 12 Apr 2024 22:56:29 +0200
Subject: [PATCH] chore: refactored a little

---
 src/routes/activitypub/inbox.rs      |  2 +-
 src/routes/activitypub/user/inbox.rs | 62 ++++++++++++----------------
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/src/routes/activitypub/inbox.rs b/src/routes/activitypub/inbox.rs
index d13d9fe1..e5b9ae25 100644
--- a/src/routes/activitypub/inbox.rs
+++ b/src/routes/activitypub/inbox.rs
@@ -17,7 +17,7 @@ pub async fn page(
 	State(ctx): State<Context>,
 	AuthIdentity(auth): AuthIdentity,
 	Query(page): Query<Pagination>,
-) -> Result<JsonLD<serde_json::Value>, UpubError> {
+) -> crate::Result<JsonLD<serde_json::Value>> {
 	let limit = page.batch.unwrap_or(20).min(50);
 	let offset = page.offset.unwrap_or(0);
 	let activities = model::addressing::Entity::find_activities()
diff --git a/src/routes/activitypub/user/inbox.rs b/src/routes/activitypub/user/inbox.rs
index 4eaf2180..ed36bd6c 100644
--- a/src/routes/activitypub/user/inbox.rs
+++ b/src/routes/activitypub/user/inbox.rs
@@ -25,43 +25,33 @@ pub async fn page(
 	AuthIdentity(auth): AuthIdentity,
 	Query(page): Query<Pagination>,
 ) -> crate::Result<JsonLD<serde_json::Value>> {
-	let uid = ctx.uid(id.clone());
-	match auth {
-		Identity::Anonymous => Err(StatusCode::FORBIDDEN.into()),
-		Identity::Remote(_) => Err(StatusCode::FORBIDDEN.into()),
-		Identity::Local(user) => if uid == user {
-			let limit = page.batch.unwrap_or(20).min(50);
-			let offset = page.offset.unwrap_or(0);
-			match model::addressing::Entity::find_activities()
-				.filter(Condition::all().add(model::addressing::Column::Actor.eq(&user)))
-				.order_by(model::addressing::Column::Published, Order::Asc)
-				.offset(offset)
-				.limit(limit)
-				.into_model::<EmbeddedActivity>()
-				.all(ctx.db())
-				.await
-			{
-				Ok(activities) => {
-					Ok(JsonLD(
-						ctx.ap_collection_page(
-							&url!(ctx, "/users/{id}/inbox/page"),
-							offset, limit,
-							activities
-								.into_iter()
-								.map(|x| x.into())
-								.collect()
-						).ld_context()
-					))
-				},
-				Err(e) => {
-					tracing::error!("failed paginating user inbox for {id}: {e}");
-					Err(StatusCode::INTERNAL_SERVER_ERROR.into())
-				},
-			}
-		} else {
-			Err(StatusCode::FORBIDDEN.into())
-		},
+	let Identity::Local(uid) = auth else {
+		// local inbox is only for local users
+		return Err(UpubError::forbidden());
+	};
+	if uid != ctx.uid(id.clone()) {
+		return Err(UpubError::forbidden());
 	}
+	let limit = page.batch.unwrap_or(20).min(50);
+	let offset = page.offset.unwrap_or(0);
+	let activities = model::addressing::Entity::find_activities()
+		.filter(Condition::all().add(model::addressing::Column::Actor.eq(&uid)))
+		.order_by(model::addressing::Column::Published, Order::Asc)
+		.offset(offset)
+		.limit(limit)
+		.into_model::<EmbeddedActivity>()
+		.all(ctx.db())
+		.await?;
+	Ok(JsonLD(
+		ctx.ap_collection_page(
+			&url!(ctx, "/users/{id}/inbox/page"),
+			offset, limit,
+			activities
+				.into_iter()
+				.map(|x| x.into())
+				.collect()
+		).ld_context()
+	))
 }
 
 pub async fn post(