Remove rest of page limit

Cargo.toml

@@ -151,7 +151,7 @@ tokio-postgres = "0.7.13"
 tokio-postgres-rustls = "0.13.0"
 urlencoding = "2.1.3"
 moka = { version = "0.12.10", features = ["future"] }
-i-love-jesus = { version = "0.1.0" }
+i-love-jesus = { version = "0.2.0" }
 clap = { version = "4.5.29", features = ["derive", "env"] }
 pretty_assertions = "1.4.1"
 derive-new = "0.7.0"

crates/api/src/comment/distinguish.rs

@@ -9,7 +9,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::{CommentView, LocalUserView};
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn distinguish_comment(
   data: Json<DistinguishComment>,
@@ -49,9 +49,7 @@ pub async fn distinguish_comment(
     distinguished: Some(data.distinguished),
     ..Default::default()
   };
-  Comment::update(&mut context.pool(), data.comment_id, &form)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
+  Comment::update(&mut context.pool(), data.comment_id, &form).await?;
 
   let comment_view = CommentView::read(
     &mut context.pool(),

crates/api/src/comment/list_comment_likes.rs

@@ -27,8 +27,31 @@ pub async fn list_comment_likes(
   )
   .await?;
 
-  let comment_likes =
-    VoteView::list_for_comment(&mut context.pool(), data.comment_id, data.page, data.limit).await?;
+  let cursor_data = if let Some(cursor) = &data.page_cursor {
+    Some(VoteView::from_comment_actions_cursor(cursor, &mut context.pool()).await?)
+  } else {
+    None
+  };
 
-  Ok(Json(ListCommentLikesResponse { comment_likes }))
+  let comment_likes = VoteView::list_for_comment(
+    &mut context.pool(),
+    data.comment_id,
+    cursor_data,
+    data.page_back,
+    data.limit,
+  )
+  .await?;
+
+  let next_page = comment_likes
+    .last()
+    .map(VoteView::to_comment_actions_cursor);
+  let prev_page = comment_likes
+    .first()
+    .map(VoteView::to_comment_actions_cursor);
+
+  Ok(Json(ListCommentLikesResponse {
+    comment_likes,
+    next_page,
+    prev_page,
+  }))
 }

crates/api/src/community/pending_follows/list.rs

@@ -4,7 +4,8 @@ use lemmy_api_common::{
   context::LemmyContext,
   utils::check_community_mod_of_any_or_admin_action,
 };
-use lemmy_db_views::structs::{CommunityFollowerView, LocalUserView};
+use lemmy_db_schema::traits::PaginationCursorBuilder;
+use lemmy_db_views::structs::{CommunityFollowerView, LocalUserView, PendingFollow};
 use lemmy_utils::error::LemmyResult;
 
 pub async fn get_pending_follows_list(
@@ -15,14 +16,30 @@ pub async fn get_pending_follows_list(
   check_community_mod_of_any_or_admin_action(&local_user_view, &mut context.pool()).await?;
   let all_communities =
     data.all_communities.unwrap_or_default() && local_user_view.local_user.admin;
+
+  let cursor_data = if let Some(cursor) = &data.page_cursor {
+    Some(CommunityFollowerView::from_cursor(cursor, &mut context.pool()).await?)
+  } else {
+    None
+  };
+
   let items = CommunityFollowerView::list_approval_required(
     &mut context.pool(),
     local_user_view.person.id,
     all_communities,
     data.pending_only.unwrap_or_default(),
-    data.page,
+    cursor_data,
+    data.page_back,
     data.limit,
   )
   .await?;
-  Ok(Json(ListCommunityPendingFollowsResponse { items }))
+
+  let next_page = items.last().map(PendingFollow::to_cursor);
+  let prev_page = items.first().map(PendingFollow::to_cursor);
+
+  Ok(Json(ListCommunityPendingFollowsResponse {
+    items,
+    next_page,
+    prev_page,
+  }))
 }

crates/api/src/local_user/add_admin.rs

@@ -12,7 +12,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::{person::person_view::PersonQuery, structs::LocalUserView};
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::LemmyResult;
 
 pub async fn add_admin(
   data: Json<AddAdmin>,
@@ -33,9 +33,7 @@ pub async fn add_admin(
   }
 
   // Make sure that the person_id added is local
-  let added_local_user = LocalUserView::read_person(&mut context.pool(), data.person_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::ObjectNotLocal)?;
+  let added_local_user = LocalUserView::read_person(&mut context.pool(), data.person_id).await?;
 
   LocalUser::update(
     &mut context.pool(),
@@ -45,8 +43,7 @@ pub async fn add_admin(
       ..Default::default()
     },
   )
-  .await
-  .with_lemmy_type(LemmyErrorType::CouldntUpdateUser)?;
+  .await?;
 
   // Mod tables
   let form = ModAddForm {

crates/api/src/local_user/ban_person.rs

@@ -17,10 +17,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::{LocalUserView, PersonView};
-use lemmy_utils::{
-  error::{LemmyErrorExt, LemmyErrorType, LemmyResult},
-  utils::validation::is_valid_body_field,
-};
+use lemmy_utils::{error::LemmyResult, utils::validation::is_valid_body_field};
 
 pub async fn ban_from_site(
   data: Json<BanPerson>,
@@ -53,8 +50,7 @@ pub async fn ban_from_site(
       ..Default::default()
     },
   )
-  .await
-  .with_lemmy_type(LemmyErrorType::CouldntUpdateUser)?;
+  .await?;
 
   // if its a local user, invalidate logins
   let local_user = LocalUserView::read_person(&mut context.pool(), person.id).await;

crates/api/src/local_user/list_banned.rs

@@ -29,12 +29,18 @@ pub async fn list_banned_users(
     banned_only: Some(true),
     cursor_data,
     limit: data.limit,
+    page_back: data.page_back,
     ..Default::default()
   }
   .list(&mut context.pool())
   .await?;
 
   let next_page = banned.last().map(PaginationCursorBuilder::to_cursor);
+  let prev_page = banned.first().map(PaginationCursorBuilder::to_cursor);
 
-  Ok(Json(BannedPersonsResponse { banned, next_page }))
+  Ok(Json(BannedPersonsResponse {
+    banned,
+    next_page,
+    prev_page,
+  }))
 }

crates/api/src/local_user/list_media.rs

@@ -3,6 +3,7 @@ use lemmy_api_common::{
   context::LemmyContext,
   person::{ListMedia, ListMediaResponse},
 };
+use lemmy_db_schema::traits::PaginationCursorBuilder;
 use lemmy_db_views::structs::{LocalImageView, LocalUserView};
 use lemmy_utils::error::LemmyResult;
 
@@ -11,14 +12,27 @@ pub async fn list_media(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<ListMediaResponse>> {
-  let page = data.page;
-  let limit = data.limit;
+  let cursor_data = if let Some(cursor) = &data.page_cursor {
+    Some(LocalImageView::from_cursor(cursor, &mut context.pool()).await?)
+  } else {
+    None
+  };
+
   let images = LocalImageView::get_all_paged_by_local_user_id(
     &mut context.pool(),
     local_user_view.local_user.id,
-    page,
-    limit,
+    cursor_data,
+    data.page_back,
+    data.limit,
   )
   .await?;
-  Ok(Json(ListMediaResponse { images }))
+
+  let next_page = images.last().map(PaginationCursorBuilder::to_cursor);
+  let prev_page = images.first().map(PaginationCursorBuilder::to_cursor);
+
+  Ok(Json(ListMediaResponse {
+    images,
+    next_page,
+    prev_page,
+  }))
 }

crates/api/src/local_user/list_saved.rs

@@ -31,11 +31,17 @@ pub async fn list_person_saved(
     type_: data.type_,
     cursor_data,
     page_back: data.page_back,
+    limit: data.limit,
   }
   .list(&mut context.pool(), &local_user_view)
   .await?;
 
   let next_page = saved.last().map(PaginationCursorBuilder::to_cursor);
+  let prev_page = saved.first().map(PaginationCursorBuilder::to_cursor);
 
-  Ok(Json(ListPersonSavedResponse { saved, next_page }))
+  Ok(Json(ListPersonSavedResponse {
+    saved,
+    next_page,
+    prev_page,
+  }))
 }

crates/api/src/local_user/notifications/list_inbox.rs

@@ -29,11 +29,17 @@ pub async fn list_inbox(
     show_bot_accounts: Some(local_user_view.local_user.show_bot_accounts),
     cursor_data,
     page_back: data.page_back,
+    limit: data.limit,
   }
   .list(&mut context.pool(), person_id)
   .await?;
 
   let next_page = inbox.last().map(PaginationCursorBuilder::to_cursor);
+  let prev_page = inbox.first().map(PaginationCursorBuilder::to_cursor);
 
-  Ok(Json(ListInboxResponse { inbox, next_page }))
+  Ok(Json(ListInboxResponse {
+    inbox,
+    next_page,
+    prev_page,
+  }))
 }

crates/api/src/local_user/notifications/mark_all_read.rs

@@ -7,7 +7,7 @@ use lemmy_db_schema::source::{
   private_message::PrivateMessage,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::LemmyResult;
 
 pub async fn mark_all_notifications_read(
   context: Data<LemmyContext>,
@@ -16,24 +16,16 @@ pub async fn mark_all_notifications_read(
   let person_id = local_user_view.person.id;
 
   // Mark all comment_replies as read
-  CommentReply::mark_all_as_read(&mut context.pool(), person_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
+  CommentReply::mark_all_as_read(&mut context.pool(), person_id).await?;
 
   // Mark all comment mentions as read
-  PersonCommentMention::mark_all_as_read(&mut context.pool(), person_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
+  PersonCommentMention::mark_all_as_read(&mut context.pool(), person_id).await?;
 
   // Mark all post mentions as read
-  PersonPostMention::mark_all_as_read(&mut context.pool(), person_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntUpdatePost)?;
+  PersonPostMention::mark_all_as_read(&mut context.pool(), person_id).await?;
 
   // Mark all private_messages as read
-  PrivateMessage::mark_all_as_read(&mut context.pool(), person_id)
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntUpdatePrivateMessage)?;
+  PrivateMessage::mark_all_as_read(&mut context.pool(), person_id).await?;
 
   Ok(Json(SuccessResponse::default()))
 }

crates/api/src/local_user/notifications/mark_comment_mention_read.rs

@@ -9,7 +9,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn mark_comment_mention_as_read(
   data: Json<MarkPersonCommentMentionAsRead>,
@@ -31,8 +31,7 @@ pub async fn mark_comment_mention_as_read(
     person_comment_mention_id,
     &PersonCommentMentionUpdateForm { read },
   )
-  .await
-  .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
+  .await?;
 
   Ok(Json(SuccessResponse::default()))
 }

crates/api/src/local_user/notifications/mark_post_mention_read.rs

@@ -9,7 +9,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn mark_post_mention_as_read(
   data: Json<MarkPersonPostMentionAsRead>,
@@ -31,8 +31,7 @@ pub async fn mark_post_mention_as_read(
     person_post_mention_id,
     &PersonPostMentionUpdateForm { read },
   )
-  .await
-  .with_lemmy_type(LemmyErrorType::CouldntUpdatePost)?;
+  .await?;
 
   Ok(Json(SuccessResponse::default()))
 }

crates/api/src/local_user/notifications/mark_reply_read.rs

@@ -5,7 +5,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 pub async fn mark_reply_as_read(
   data: Json<MarkCommentReplyAsRead>,
@@ -27,8 +27,7 @@ pub async fn mark_reply_as_read(
     comment_reply_id,
     &CommentReplyUpdateForm { read },
   )
-  .await
-  .with_lemmy_type(LemmyErrorType::CouldntUpdateComment)?;
+  .await?;
 
   Ok(Json(SuccessResponse::default()))
 }