Simplify handling of NotFound SQL errors (fixes #4633) (#5031)

* Simplify handling of NotFound SQL errors (fixes #4633)

* fmt

* wip

* compiling

* clippy

* api tests

* fix

api_tests/package.json

@@ -27,7 +27,7 @@
     "eslint": "^9.8.0",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.5.0",
-    "lemmy-js-client": "0.20.0-alpha.4",
+    "lemmy-js-client": "0.20.0-alpha.11",
     "prettier": "^3.2.5",
     "ts-jest": "^29.1.0",
     "typescript": "^5.5.4",

api_tests/pnpm-lock.yaml

@@ -30,8 +30,8 @@ importers:
         specifier: ^29.5.0
         version: 29.7.0(@types/node@22.3.0)
       lemmy-js-client:
-        specifier: 0.20.0-alpha.4
+        specifier: 0.20.0-alpha.11
-        version: 0.20.0-alpha.4
+        version: 0.20.0-alpha.11
       prettier:
         specifier: ^3.2.5
         version: 3.3.3
@@ -1175,8 +1175,8 @@ packages:
     resolution: {integrity: sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==}
     engines: {node: '>=6'}
 
-  lemmy-js-client@0.20.0-alpha.4:
+  lemmy-js-client@0.20.0-alpha.11:
-    resolution: {integrity: sha512-MuVE8u/IFz59ks2vxOUXMRU8x6SIz3Keu4zRhmhNt+n+gI25JAggsTDrtxVCBtrqBhFEe+a3PdXdwm+fXbs0Dw==}
+    resolution: {integrity: sha512-iRSG4xHMjPDIreQqVIoJ5JrMY71uk07G0Zbgyf068xKbib22J3+i1x/XgCTs6tiHlqTnw1Ig/KRq7p7qJoA4uw==}
 
   leven@3.1.0:
     resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==}
@@ -3107,7 +3107,7 @@ snapshots:
 
   kleur@3.0.3: {}
 
-  lemmy-js-client@0.20.0-alpha.4: {}
+  lemmy-js-client@0.20.0-alpha.11: {}
 
   leven@3.1.0: {}
 

api_tests/src/comment.spec.ts

@@ -92,7 +92,7 @@ test("Create a comment", async () => {
 
 test("Create a comment in a non-existent post", async () => {
   await expect(createComment(alpha, -1)).rejects.toStrictEqual(
-    Error("couldnt_find_post"),
+    Error("not_found"),
   );
 });
 
@@ -143,7 +143,7 @@ test("Delete a comment", async () => {
     await waitUntil(
       () =>
         resolveComment(gamma, commentRes.comment_view.comment).catch(e => e),
-      r => r.message !== "couldnt_find_object",
+      r => r.message !== "not_found",
     )
   ).comment;
   if (!gammaComment) {
@@ -161,13 +161,13 @@ test("Delete a comment", async () => {
   // Make sure that comment is undefined on beta
   await waitUntil(
     () => resolveComment(beta, commentRes.comment_view.comment).catch(e => e),
-    e => e.message == "couldnt_find_object",
+    e => e.message == "not_found",
   );
 
   // Make sure that comment is undefined on gamma after delete
   await waitUntil(
     () => resolveComment(gamma, commentRes.comment_view.comment).catch(e => e),
-    e => e.message === "couldnt_find_object",
+    e => e.message === "not_found",
   );
 
   // Test undeleting the comment
@@ -182,7 +182,7 @@ test("Delete a comment", async () => {
   let betaComment2 = (
     await waitUntil(
       () => resolveComment(beta, commentRes.comment_view.comment).catch(e => e),
-      e => e.message !== "couldnt_find_object",
+      e => e.message !== "not_found",
     )
   ).comment;
   expect(betaComment2?.comment.deleted).toBe(false);

api_tests/src/community.spec.ts

@@ -527,12 +527,12 @@ test("Content in local-only community doesn't federate", async () => {
   // cant resolve the community from another instance
   await expect(
     resolveCommunity(beta, communityRes.actor_id),
-  ).rejects.toStrictEqual(Error("couldnt_find_object"));
+  ).rejects.toStrictEqual(Error("not_found"));
 
   // create a post, also cant resolve it
   let postRes = await createPost(alpha, communityRes.id);
   await expect(resolvePost(beta, postRes.post_view.post)).rejects.toStrictEqual(
-    Error("couldnt_find_object"),
+    Error("not_found"),
   );
 });
 

api_tests/src/post.spec.ts

@@ -125,12 +125,12 @@ test("Create a post", async () => {
   // Delta only follows beta, so it should not see an alpha ap_id
   await expect(
     resolvePost(delta, postRes.post_view.post),
-  ).rejects.toStrictEqual(Error("couldnt_find_object"));
+  ).rejects.toStrictEqual(Error("not_found"));
 
   // Epsilon has alpha blocked, it should not see the alpha post
   await expect(
     resolvePost(epsilon, postRes.post_view.post),
-  ).rejects.toStrictEqual(Error("couldnt_find_object"));
+  ).rejects.toStrictEqual(Error("not_found"));
 
   // remove added allow/blocklists
   editSiteForm.allowed_instances = [];
@@ -140,9 +140,7 @@ test("Create a post", async () => {
 });
 
 test("Create a post in a non-existent community", async () => {
-  await expect(createPost(alpha, -2)).rejects.toStrictEqual(
+  await expect(createPost(alpha, -2)).rejects.toStrictEqual(Error("not_found"));
-    Error("couldnt_find_community"),
-  );
 });
 
 test("Unlike a post", async () => {

api_tests/src/shared.ts

@@ -690,7 +690,7 @@ export async function saveUserSettingsBio(
     blur_nsfw: false,
     auto_expand: true,
     theme: "darkly",
-    default_sort_type: "Active",
+    default_post_sort_type: "Active",
     default_listing_type: "All",
     interface_language: "en",
     show_avatars: true,
@@ -710,7 +710,7 @@ export async function saveUserSettingsFederated(
     show_nsfw: false,
     blur_nsfw: true,
     auto_expand: false,
-    default_sort_type: "Hot",
+    default_post_sort_type: "Hot",
     default_listing_type: "All",
     interface_language: "",
     avatar,

crates/api/src/comment/distinguish.rs

@@ -22,8 +22,7 @@ pub async fn distinguish_comment(
     data.comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -60,8 +59,7 @@ pub async fn distinguish_comment(
     data.comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   Ok(Json(CommentResponse {
     comment_view,

crates/api/src/comment/like.rs

@@ -40,8 +40,7 @@ pub async fn like_comment(
     comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -54,8 +53,7 @@ pub async fn like_comment(
   let comment_reply = CommentReply::read_by_comment(&mut context.pool(), comment_id).await;
   if let Ok(Some(reply)) = comment_reply {
     let recipient_id = reply.recipient_id;
-    if let Ok(Some(local_recipient)) =
+    if let Ok(local_recipient) = LocalUserView::read_person(&mut context.pool(), recipient_id).await
-      LocalUserView::read_person(&mut context.pool(), recipient_id).await
     {
       recipient_ids.push(local_recipient.local_user.id);
     }

crates/api/src/comment/list_comment_likes.rs

@@ -5,7 +5,7 @@ use lemmy_api_common::{
   utils::is_mod_or_admin,
 };
 use lemmy_db_views::structs::{CommentView, LocalUserView, VoteView};
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 /// Lists likes for a comment
 #[tracing::instrument(skip(context))]
@@ -19,8 +19,7 @@ pub async fn list_comment_likes(
     data.comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   is_mod_or_admin(
     &mut context.pool(),

crates/api/src/comment/save.rs

@@ -37,8 +37,7 @@ pub async fn save_comment(
     comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   Ok(Json(CommentResponse {
     comment_view,

crates/api/src/comment_report/create.rs

@@ -40,8 +40,7 @@ pub async fn create_comment_report(
     comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -64,9 +63,8 @@ pub async fn create_comment_report(
     .await
     .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-  let comment_report_view = CommentReportView::read(&mut context.pool(), report.id, person_id)
+  let comment_report_view =
-    .await?
+    CommentReportView::read(&mut context.pool(), report.id, person_id).await?;
-    .ok_or(LemmyErrorType::CouldntFindCommentReport)?;
 
   // Email the admins
   if local_site.reports_email_admins {

crates/api/src/comment_report/resolve.rs

@@ -17,9 +17,7 @@ pub async fn resolve_comment_report(
 ) -> LemmyResult<Json<CommentReportResponse>> {
   let report_id = data.report_id;
   let person_id = local_user_view.person.id;
-  let report = CommentReportView::read(&mut context.pool(), report_id, person_id)
+  let report = CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommentReport)?;
 
   let person_id = local_user_view.person.id;
   check_community_mod_action(
@@ -41,9 +39,8 @@ pub async fn resolve_comment_report(
   }
 
   let report_id = data.report_id;
-  let comment_report_view = CommentReportView::read(&mut context.pool(), report_id, person_id)
+  let comment_report_view =
-    .await?
+    CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
-    .ok_or(LemmyErrorType::CouldntFindCommentReport)?;
 
   Ok(Json(CommentReportResponse {
     comment_report_view,

crates/api/src/community/add_mod.rs

@@ -46,9 +46,7 @@ pub async fn add_mod_to_community(
     .await?;
   }
 
-  let community = Community::read(&mut context.pool(), community_id)
+  let community = Community::read(&mut context.pool(), community_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   // If user is admin and community is remote, explicitly check that he is a
   // moderator. This is necessary because otherwise the action would be rejected

crates/api/src/community/ban.rs

@@ -111,9 +111,7 @@ pub async fn ban_from_community(
 
   ModBanFromCommunity::create(&mut context.pool(), &form).await?;
 
-  let person_view = PersonView::read(&mut context.pool(), data.person_id)
+  let person_view = PersonView::read(&mut context.pool(), data.person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   ActivityChannel::submit_activity(
     SendActivityData::BanFromCommunity {

crates/api/src/community/block.rs

@@ -56,8 +56,7 @@ pub async fn block_community(
     Some(&local_user_view.local_user),
     false,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   ActivityChannel::submit_activity(
     SendActivityData::FollowCommunity(

crates/api/src/community/follow.rs

@@ -23,9 +23,7 @@ pub async fn follow_community(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommunityResponse>> {
-  let community = Community::read(&mut context.pool(), data.community_id)
+  let community = Community::read(&mut context.pool(), data.community_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   let mut community_follower_form = CommunityFollowerForm {
     community_id: community.id,
     person_id: local_user_view.person.id,
@@ -68,8 +66,7 @@ pub async fn follow_community(
     Some(&local_user_view.local_user),
     false,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   let discussion_languages = CommunityLanguage::read(&mut context.pool(), community_id).await?;
 

crates/api/src/community/transfer.rs

@@ -82,13 +82,10 @@ pub async fn transfer_community(
     Some(&local_user_view.local_user),
     false,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   let community_id = data.community_id;
-  let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id)
+  let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id).await?;
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?;
 
   // Return the jwt
   Ok(Json(GetCommunityResponse {

crates/api/src/lib.rs

@@ -258,9 +258,7 @@ pub async fn local_user_view_from_jwt(
   let local_user_id = Claims::validate(jwt, context)
     .await
     .with_lemmy_type(LemmyErrorType::NotLoggedIn)?;
-  let local_user_view = LocalUserView::read(&mut context.pool(), local_user_id)
+  let local_user_view = LocalUserView::read(&mut context.pool(), local_user_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindLocalUser)?;
   check_user_valid(&local_user_view.person)?;
 
   Ok(local_user_view)

crates/api/src/local_user/add_admin.rs

@@ -36,8 +36,8 @@ 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?
+    .await
-    .ok_or(LemmyErrorType::ObjectNotLocal)?;
+    .map_err(|_| LemmyErrorType::ObjectNotLocal)?;
 
   LocalUser::update(
     &mut context.pool(),

crates/api/src/local_user/ban_person.rs

@@ -60,7 +60,7 @@ pub async fn ban_from_site(
 
   // if its a local user, invalidate logins
   let local_user = LocalUserView::read_person(&mut context.pool(), person.id).await;
-  if let Ok(Some(local_user)) = local_user {
+  if let Ok(local_user) = local_user {
     LoginToken::invalidate_all(&mut context.pool(), local_user.local_user.id).await?;
   }
 
@@ -84,9 +84,7 @@ pub async fn ban_from_site(
 
   ModBan::create(&mut context.pool(), &form).await?;
 
-  let person_view = PersonView::read(&mut context.pool(), person.id)
+  let person_view = PersonView::read(&mut context.pool(), person.id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   ban_nonlocal_user_from_local_communities(
     &local_user_view,

crates/api/src/local_user/block.rs

@@ -32,8 +32,7 @@ pub async fn block_person(
 
   let target_user = LocalUserView::read_person(&mut context.pool(), target_id)
     .await
-    .ok()
+    .ok();
-    .flatten();
 
   if target_user.is_some_and(|t| t.local_user.admin) {
     Err(LemmyErrorType::CantBlockAdmin)?
@@ -49,9 +48,7 @@ pub async fn block_person(
       .with_lemmy_type(LemmyErrorType::PersonBlockAlreadyExists)?;
   }
 
-  let person_view = PersonView::read(&mut context.pool(), target_id)
+  let person_view = PersonView::read(&mut context.pool(), target_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
   Ok(Json(BlockPersonResponse {
     person_view,
     blocked: data.block,

crates/api/src/local_user/change_password_after_reset.rs

@@ -21,7 +21,6 @@ pub async fn change_password_after_reset(
   let token = data.token.clone();
   let local_user_id = PasswordResetRequest::read_and_delete(&mut context.pool(), &token)
     .await?
-    .ok_or(LemmyErrorType::TokenNotFound)?
     .local_user_id;
 
   password_length_check(&data.password)?;

crates/api/src/local_user/login.rs

@@ -24,9 +24,7 @@ pub async fn login(
   // Fetch that username / email
   let username_or_email = data.username_or_email.clone();
   let local_user_view =
-    LocalUserView::find_by_email_or_name(&mut context.pool(), &username_or_email)
+    LocalUserView::find_by_email_or_name(&mut context.pool(), &username_or_email).await?;
-      .await?
-      .ok_or(LemmyErrorType::IncorrectLogin)?;
 
   // Verify the password
   let valid: bool = local_user_view

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

@@ -18,9 +18,7 @@ pub async fn mark_person_mention_as_read(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PersonMentionResponse>> {
   let person_mention_id = data.person_mention_id;
-  let read_person_mention = PersonMention::read(&mut context.pool(), person_mention_id)
+  let read_person_mention = PersonMention::read(&mut context.pool(), person_mention_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPersonMention)?;
 
   if local_user_view.person.id != read_person_mention.recipient_id {
     Err(LemmyErrorType::CouldntUpdateComment)?
@@ -39,9 +37,7 @@ pub async fn mark_person_mention_as_read(
   let person_mention_id = read_person_mention.id;
   let person_id = local_user_view.person.id;
   let person_mention_view =
-    PersonMentionView::read(&mut context.pool(), person_mention_id, Some(person_id))
+    PersonMentionView::read(&mut context.pool(), person_mention_id, Some(person_id)).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPersonMention)?;
 
   Ok(Json(PersonMentionResponse {
     person_mention_view,

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

@@ -18,9 +18,7 @@ pub async fn mark_reply_as_read(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<CommentReplyResponse>> {
   let comment_reply_id = data.comment_reply_id;
-  let read_comment_reply = CommentReply::read(&mut context.pool(), comment_reply_id)
+  let read_comment_reply = CommentReply::read(&mut context.pool(), comment_reply_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommentReply)?;
 
   if local_user_view.person.id != read_comment_reply.recipient_id {
     Err(LemmyErrorType::CouldntUpdateComment)?
@@ -40,9 +38,7 @@ pub async fn mark_reply_as_read(
   let comment_reply_id = read_comment_reply.id;
   let person_id = local_user_view.person.id;
   let comment_reply_view =
-    CommentReplyView::read(&mut context.pool(), comment_reply_id, Some(person_id))
+    CommentReplyView::read(&mut context.pool(), comment_reply_id, Some(person_id)).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindCommentReply)?;
 
   Ok(Json(CommentReplyResponse { comment_reply_view }))
 }

crates/api/src/local_user/reset_password.rs

@@ -16,8 +16,8 @@ pub async fn reset_password(
   // Fetch that email
   let email = data.email.to_lowercase();
   let local_user_view = LocalUserView::find_by_email(&mut context.pool(), &email)
-    .await?
+    .await
-    .ok_or(LemmyErrorType::IncorrectLogin)?;
+    .map_err(|_| LemmyErrorType::IncorrectLogin)?;
 
   let site_view = SiteView::read_local(&mut context.pool()).await?;
   check_email_verified(&local_user_view, &site_view)?;

crates/api/src/local_user/verify_email.rs

@@ -10,7 +10,7 @@ use lemmy_db_schema::source::{
   local_user::{LocalUser, LocalUserUpdateForm},
 };
 use lemmy_db_views::structs::{LocalUserView, SiteView};
-use lemmy_utils::error::{LemmyErrorType, LemmyResult};
+use lemmy_utils::error::LemmyResult;
 
 pub async fn verify_email(
   data: Json<VerifyEmail>,
@@ -18,9 +18,7 @@ pub async fn verify_email(
 ) -> LemmyResult<Json<SuccessResponse>> {
   let site_view = SiteView::read_local(&mut context.pool()).await?;
   let token = data.token.clone();
-  let verification = EmailVerification::read_for_token(&mut context.pool(), &token)
+  let verification = EmailVerification::read_for_token(&mut context.pool(), &token).await?;
-    .await?
-    .ok_or(LemmyErrorType::TokenNotFound)?;
 
   let form = LocalUserUpdateForm {
     // necessary in case this is a new signup
@@ -37,9 +35,7 @@ pub async fn verify_email(
 
   // send out notification about registration application to admins if enabled
   if site_view.local_site.application_email_admins {
-    let local_user = LocalUserView::read(&mut context.pool(), local_user_id)
+    let local_user = LocalUserView::read(&mut context.pool(), local_user_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
     send_new_applicant_email_to_admins(
       &local_user.person.name,

crates/api/src/post/feature.rs

@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   PostFeatureType,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 #[tracing::instrument(skip(context))]
 pub async fn feature_post(
@@ -25,9 +25,7 @@ pub async fn feature_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id)
+  let orig_post = Post::read(&mut context.pool(), post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_mod_action(
     &local_user_view.person,

crates/api/src/post/like.rs

@@ -38,9 +38,7 @@ pub async fn like_post(
 
   // Check for a community ban
   let post_id = data.post_id;
-  let post = Post::read(&mut context.pool(), post_id)
+  let post = Post::read(&mut context.pool(), post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -70,9 +68,7 @@ pub async fn like_post(
 
   mark_post_as_read(person_id, post_id, &mut context.pool()).await?;
 
-  let community = Community::read(&mut context.pool(), post.community_id)
+  let community = Community::read(&mut context.pool(), post.community_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   ActivityChannel::submit_activity(
     SendActivityData::LikePostOrComment {

crates/api/src/post/list_post_likes.rs

@@ -6,7 +6,7 @@ use lemmy_api_common::{
 };
 use lemmy_db_schema::{source::post::Post, traits::Crud};
 use lemmy_db_views::structs::{LocalUserView, VoteView};
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 /// Lists likes for a post
 #[tracing::instrument(skip(context))]
@@ -15,9 +15,7 @@ pub async fn list_post_likes(
   context: Data<LemmyContext>,
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<ListPostLikesResponse>> {
-  let post = Post::read(&mut context.pool(), data.post_id)
+  let post = Post::read(&mut context.pool(), data.post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
   is_mod_or_admin(
     &mut context.pool(),
     &local_user_view.person,

crates/api/src/post/lock.rs

@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 #[tracing::instrument(skip(context))]
 pub async fn lock_post(
@@ -24,9 +24,7 @@ pub async fn lock_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id)
+  let orig_post = Post::read(&mut context.pool(), post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_mod_action(
     &local_user_view.person,

crates/api/src/post/save.rs

@@ -40,8 +40,7 @@ pub async fn save_post(
     Some(&local_user_view.local_user),
     false,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   mark_post_as_read(person_id, post_id, &mut context.pool()).await?;
 

crates/api/src/post_report/create.rs

@@ -35,9 +35,7 @@ pub async fn create_post_report(
 
   let person_id = local_user_view.person.id;
   let post_id = data.post_id;
-  let post_view = PostView::read(&mut context.pool(), post_id, None, false)
+  let post_view = PostView::read(&mut context.pool(), post_id, None, false).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_user_action(
     &local_user_view.person,
@@ -61,9 +59,7 @@ pub async fn create_post_report(
     .await
     .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-  let post_report_view = PostReportView::read(&mut context.pool(), report.id, person_id)
+  let post_report_view = PostReportView::read(&mut context.pool(), report.id, person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPostReport)?;
 
   // Email the admins
   if local_site.reports_email_admins {

crates/api/src/post_report/resolve.rs

@@ -17,9 +17,7 @@ pub async fn resolve_post_report(
 ) -> LemmyResult<Json<PostReportResponse>> {
   let report_id = data.report_id;
   let person_id = local_user_view.person.id;
-  let report = PostReportView::read(&mut context.pool(), report_id, person_id)
+  let report = PostReportView::read(&mut context.pool(), report_id, person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPostReport)?;
 
   let person_id = local_user_view.person.id;
   check_community_mod_action(
@@ -40,9 +38,7 @@ pub async fn resolve_post_report(
       .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
   }
 
-  let post_report_view = PostReportView::read(&mut context.pool(), report_id, person_id)
+  let post_report_view = PostReportView::read(&mut context.pool(), report_id, person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPostReport)?;
 
   Ok(Json(PostReportResponse { post_report_view }))
 }

crates/api/src/private_message/mark_read.rs

@@ -18,9 +18,7 @@ pub async fn mark_pm_as_read(
 ) -> LemmyResult<Json<PrivateMessageResponse>> {
   // Checking permissions
   let private_message_id = data.private_message_id;
-  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   if local_user_view.person.id != orig_private_message.recipient_id {
     Err(LemmyErrorType::CouldntUpdatePrivateMessage)?
   }
@@ -39,9 +37,7 @@ pub async fn mark_pm_as_read(
   .await
   .with_lemmy_type(LemmyErrorType::CouldntUpdatePrivateMessage)?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), private_message_id)
+  let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   Ok(Json(PrivateMessageResponse {
     private_message_view: view,
   }))

crates/api/src/private_message_report/create.rs

@@ -29,9 +29,7 @@ pub async fn create_pm_report(
 
   let person_id = local_user_view.person.id;
   let private_message_id = data.private_message_id;
-  let private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+  let private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
 
   // Make sure that only the recipient of the private message can create a report
   if person_id != private_message.recipient_id {
@@ -49,9 +47,8 @@ pub async fn create_pm_report(
     .await
     .with_lemmy_type(LemmyErrorType::CouldntCreateReport)?;
 
-  let private_message_report_view = PrivateMessageReportView::read(&mut context.pool(), report.id)
+  let private_message_report_view =
-    .await?
+    PrivateMessageReportView::read(&mut context.pool(), report.id).await?;
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessageReport)?;
 
   // Email the admins
   if local_site.reports_email_admins {

crates/api/src/private_message_report/resolve.rs

@@ -28,9 +28,8 @@ pub async fn resolve_pm_report(
       .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
   }
 
-  let private_message_report_view = PrivateMessageReportView::read(&mut context.pool(), report_id)
+  let private_message_report_view =
-    .await?
+    PrivateMessageReportView::read(&mut context.pool(), report_id).await?;
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessageReport)?;
 
   Ok(Json(PrivateMessageReportResponse {
     private_message_report_view,

crates/api/src/site/purge/comment.rs

@@ -16,7 +16,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::{CommentView, LocalUserView};
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_comment(
@@ -35,8 +35,7 @@ pub async fn purge_comment(
     comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   // Also check that you're a higher admin
   LocalUser::is_higher_admin_check(

crates/api/src/site/purge/community.rs

@@ -19,7 +19,7 @@ use lemmy_db_schema::{
 };
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_db_views_actor::structs::CommunityModeratorView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_community(
@@ -31,9 +31,7 @@ pub async fn purge_community(
   is_admin(&local_user_view)?;
 
   // Read the community to get its images
-  let community = Community::read(&mut context.pool(), data.community_id)
+  let community = Community::read(&mut context.pool(), data.community_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   // Also check that you're a higher admin than all the mods
   let community_mod_person_ids =

crates/api/src/site/purge/person.rs

@@ -17,7 +17,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_person(
@@ -36,9 +36,7 @@ pub async fn purge_person(
   )
   .await?;
 
-  let person = Person::read(&mut context.pool(), data.person_id)
+  let person = Person::read(&mut context.pool(), data.person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   ban_nonlocal_user_from_local_communities(
     &local_user_view,

crates/api/src/site/purge/post.rs

@@ -17,7 +17,7 @@ use lemmy_db_schema::{
   traits::Crud,
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 #[tracing::instrument(skip(context))]
 pub async fn purge_post(
@@ -29,9 +29,7 @@ pub async fn purge_post(
   is_admin(&local_user_view)?;
 
   // Read the post to get the community_id
-  let post = Post::read(&mut context.pool(), data.post_id)
+  let post = Post::read(&mut context.pool(), data.post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   // Also check that you're a higher admin
   LocalUser::is_higher_admin_check(

crates/api/src/site/registration_applications/approve.rs

@@ -14,10 +14,7 @@ use lemmy_db_schema::{
   utils::{diesel_string_update, get_conn},
 };
 use lemmy_db_views::structs::{LocalUserView, RegistrationApplicationView};
-use lemmy_utils::{
+use lemmy_utils::error::{LemmyError, LemmyResult};
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
 
 pub async fn approve_registration_application(
   data: Json<ApproveRegistrationApplication>,
@@ -61,9 +58,8 @@ pub async fn approve_registration_application(
     .await?;
 
   if data.approve {
-    let approved_local_user_view = LocalUserView::read(&mut context.pool(), approved_user_id)
+    let approved_local_user_view =
-      .await?
+      LocalUserView::read(&mut context.pool(), approved_user_id).await?;
-      .ok_or(LemmyErrorType::CouldntFindLocalUser)?;
     if approved_local_user_view.local_user.email.is_some() {
       // Email sending may fail, but this won't revert the application approval
       send_application_approved_email(&approved_local_user_view, context.settings()).await?;
@@ -71,9 +67,8 @@ pub async fn approve_registration_application(
   };
 
   // Read the view
-  let registration_application = RegistrationApplicationView::read(&mut context.pool(), app_id)
+  let registration_application =
-    .await?
+    RegistrationApplicationView::read(&mut context.pool(), app_id).await?;
-    .ok_or(LemmyErrorType::CouldntFindRegistrationApplication)?;
 
   Ok(Json(RegistrationApplicationResponse {
     registration_application,

crates/api/src/site/registration_applications/get.rs

@@ -5,7 +5,7 @@ use lemmy_api_common::{
   utils::is_admin,
 };
 use lemmy_db_views::structs::{LocalUserView, RegistrationApplicationView};
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 /// Lists registration applications, filterable by undenied only.
 pub async fn get_registration_application(
@@ -18,9 +18,7 @@ pub async fn get_registration_application(
 
   // Read the view
   let registration_application =
-    RegistrationApplicationView::read_by_person(&mut context.pool(), data.person_id)
+    RegistrationApplicationView::read_by_person(&mut context.pool(), data.person_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindRegistrationApplication)?;
 
   Ok(Json(RegistrationApplicationResponse {
     registration_application,

crates/api/src/site/registration_applications/tests.rs

@@ -54,9 +54,7 @@ async fn create_test_site(context: &Data<LemmyContext>) -> LemmyResult<(Instance
   )
   .await?;
 
-  let admin_local_user_view = LocalUserView::read_person(pool, admin_person.id)
+  let admin_local_user_view = LocalUserView::read_person(pool, admin_person.id).await?;
-    .await?
-    .unwrap();
 
   let site_form = SiteInsertForm::new("test site".to_string(), inserted_instance.id);
   let site = Site::create(pool, &site_form).await.unwrap();

crates/api_common/src/build_response.rs

@@ -27,7 +27,6 @@ use lemmy_db_views_actor::structs::CommunityView;
 use lemmy_utils::{
   error::LemmyResult,
   utils::{markdown::markdown_to_html, mention::MentionData},
-  LemmyErrorType,
 };
 
 pub async fn build_comment_response(
@@ -37,9 +36,8 @@ pub async fn build_comment_response(
   recipient_ids: Vec<LocalUserId>,
 ) -> LemmyResult<CommentResponse> {
   let local_user = local_user_view.map(|l| l.local_user);
-  let comment_view = CommentView::read(&mut context.pool(), comment_id, local_user.as_ref())
+  let comment_view =
-    .await?
+    CommentView::read(&mut context.pool(), comment_id, local_user.as_ref()).await?;
-    .ok_or(LemmyErrorType::CouldntFindComment)?;
   Ok(CommentResponse {
     comment_view,
     recipient_ids,
@@ -61,8 +59,7 @@ pub async fn build_community_response(
     Some(&local_user),
     is_mod_or_admin,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   let discussion_languages = CommunityLanguage::read(&mut context.pool(), community_id).await?;
 
   Ok(Json(CommunityResponse {
@@ -87,8 +84,7 @@ pub async fn build_post_response(
     Some(&local_user),
     is_mod_or_admin,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindPost)?;
   Ok(Json(PostResponse { post_view }))
 }
 
@@ -112,8 +108,7 @@ pub async fn send_local_notifs(
     comment_id,
     local_user_view.map(|view| &view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
   let comment = comment_view.comment;
   let post = comment_view.post;
   let community = comment_view.community;
@@ -125,7 +120,7 @@ pub async fn send_local_notifs(
   {
     let mention_name = mention.name.clone();
     let user_view = LocalUserView::read_from_name(&mut context.pool(), &mention_name).await;
-    if let Ok(Some(mention_user_view)) = user_view {
+    if let Ok(mention_user_view) = user_view {
       // TODO
       // At some point, make it so you can't tag the parent creator either
       // Potential duplication of notifications, one for reply and the other for mention, is handled
@@ -161,9 +156,7 @@ pub async fn send_local_notifs(
 
   // Send comment_reply to the parent commenter / poster
   if let Some(parent_comment_id) = comment.parent_comment_id() {
-    let parent_comment = Comment::read(&mut context.pool(), parent_comment_id)
+    let parent_comment = Comment::read(&mut context.pool(), parent_comment_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindComment)?;
 
     // Get the parent commenter local_user
     let parent_creator_id = parent_comment.creator_id;
@@ -182,7 +175,7 @@ pub async fn send_local_notifs(
     // Don't send a notif to yourself
     if parent_comment.creator_id != person.id && !check_blocks {
       let user_view = LocalUserView::read_person(&mut context.pool(), parent_creator_id).await;
-      if let Ok(Some(parent_user_view)) = user_view {
+      if let Ok(parent_user_view) = user_view {
         // Don't duplicate notif if already mentioned by checking recipient ids
         if !recipient_ids.contains(&parent_user_view.local_user.id) {
           recipient_ids.push(parent_user_view.local_user.id);
@@ -229,7 +222,7 @@ pub async fn send_local_notifs(
     if post.creator_id != person.id && !check_blocks {
       let creator_id = post.creator_id;
       let parent_user = LocalUserView::read_person(&mut context.pool(), creator_id).await;
-      if let Ok(Some(parent_user_view)) = parent_user {
+      if let Ok(parent_user_view) = parent_user {
         if !recipient_ids.contains(&parent_user_view.local_user.id) {
           recipient_ids.push(parent_user_view.local_user.id);
 

crates/api_common/src/utils.rs

@@ -175,9 +175,7 @@ pub async fn update_read_comments(
     ..PersonPostAggregatesForm::default()
   };
 
-  PersonPostAggregates::upsert(pool, &person_post_agg_form)
+  PersonPostAggregates::upsert(pool, &person_post_agg_form).await?;
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntFindPost)?;
 
   Ok(())
 }
@@ -223,9 +221,7 @@ pub async fn check_registration_application(
     // Fetch the registration application. If no admin id is present its still pending. Otherwise it
     // was processed (either accepted or denied).
     let local_user_id = local_user_view.local_user.id;
-    let registration = RegistrationApplication::find_by_local_user_id(pool, local_user_id)
+    let registration = RegistrationApplication::find_by_local_user_id(pool, local_user_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindRegistrationApplication)?;
     if registration.admin_id.is_some() {
       Err(LemmyErrorType::RegistrationDenied(registration.deny_reason))?
     } else {
@@ -254,9 +250,7 @@ async fn check_community_deleted_removed(
   community_id: CommunityId,
   pool: &mut DbPool<'_>,
 ) -> LemmyResult<()> {
-  let community = Community::read(pool, community_id)
+  let community = Community::read(pool, community_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   if community.deleted || community.removed {
     Err(LemmyErrorType::Deleted)?
   }
@@ -704,7 +698,7 @@ pub async fn purge_image_posts_for_person(
 
 /// Delete a local_user's images
 async fn delete_local_user_images(person_id: PersonId, context: &LemmyContext) -> LemmyResult<()> {
-  if let Ok(Some(local_user)) = LocalUserView::read_person(&mut context.pool(), person_id).await {
+  if let Ok(local_user) = LocalUserView::read_person(&mut context.pool(), person_id).await {
     let pictrs_uploads =
       LocalImageView::get_all_by_local_user_id(&mut context.pool(), local_user.local_user.id)
         .await?;
@@ -749,9 +743,7 @@ pub async fn remove_user_data(
 ) -> LemmyResult<()> {
   let pool = &mut context.pool();
   // Purge user images
-  let person = Person::read(pool, banned_person_id)
+  let person = Person::read(pool, banned_person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
   if let Some(avatar) = person.avatar {
     purge_image_from_pictrs(&avatar, context).await.ok();
   }
@@ -881,9 +873,7 @@ pub async fn remove_or_restore_user_data_in_community(
 pub async fn purge_user_account(person_id: PersonId, context: &LemmyContext) -> LemmyResult<()> {
   let pool = &mut context.pool();
 
-  let person = Person::read(pool, person_id)
+  let person = Person::read(pool, person_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   // Delete their local images, if they're a local user
   delete_local_user_images(person_id, context).await.ok();
@@ -913,7 +903,7 @@ pub async fn purge_user_account(person_id: PersonId, context: &LemmyContext) ->
   CommunityModerator::leave_all_communities(pool, person_id).await?;
 
   // Delete the oauth accounts linked to the local user
-  if let Ok(Some(local_user)) = LocalUserView::read_person(pool, person_id).await {
+  if let Ok(local_user) = LocalUserView::read_person(pool, person_id).await {
     OAuthAccount::delete_user_accounts(pool, local_user.local_user.id).await?;
   }
 

crates/api_crud/src/comment/create.rs

@@ -57,8 +57,7 @@ pub async fn create_comment(
     Some(&local_user_view.local_user),
     true,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   let post = post_view.post;
   let community_id = post_view.community.id;
@@ -79,8 +78,7 @@ pub async fn create_comment(
     Comment::read(&mut context.pool(), parent_id).await.ok()
   } else {
     None
-  }
+  };
-  .flatten();
 
   // If there's a parent_id, check to make sure that comment is in that post
   // Strange issue where sometimes the post ID of the parent comment is incorrect

crates/api_crud/src/comment/delete.rs

@@ -26,8 +26,7 @@ pub async fn delete_comment(
     comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   // Dont delete it if its already been deleted.
   if orig_comment.comment.deleted == data.deleted {

crates/api_crud/src/comment/remove.rs

@@ -31,8 +31,7 @@ pub async fn remove_comment(
     comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_mod_action(
     &local_user_view.person,

crates/api_crud/src/comment/update.rs

@@ -41,8 +41,7 @@ pub async fn update_comment(
     comment_id,
     Some(&local_user_view.local_user),
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindComment)?;
 
   check_community_user_action(
     &local_user_view.person,

crates/api_crud/src/community/update.rs

@@ -51,9 +51,7 @@ pub async fn update_community(
     is_valid_body_field(desc, false)?;
   }
 
-  let old_community = Community::read(&mut context.pool(), data.community_id)
+  let old_community = Community::read(&mut context.pool(), data.community_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   let icon = diesel_url_update(data.icon.as_deref())?;
   replace_image(&icon, &old_community.icon, &context).await?;

crates/api_crud/src/oauth_provider/update.rs

@@ -7,7 +7,7 @@ use lemmy_db_schema::{
   utils::{diesel_required_string_update, diesel_required_url_update, naive_now},
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyError, LemmyErrorType};
+use lemmy_utils::error::LemmyError;
 
 #[tracing::instrument(skip(context))]
 pub async fn update_oauth_provider(
@@ -37,8 +37,6 @@ pub async fn update_oauth_provider(
 
   let update_result =
     OAuthProvider::update(&mut context.pool(), data.id, &oauth_provider_form).await?;
-  let oauth_provider = OAuthProvider::read(&mut context.pool(), update_result.id)
+  let oauth_provider = OAuthProvider::read(&mut context.pool(), update_result.id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindOauthProvider)?;
   Ok(Json(oauth_provider))
 }

crates/api_crud/src/post/create.rs

@@ -92,9 +92,7 @@ pub async fn create_post(
   .await?;
 
   let community_id = data.community_id;
-  let community = Community::read(&mut context.pool(), community_id)
+  let community = Community::read(&mut context.pool(), community_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   if community.posting_restricted_to_mods {
     let community_id = data.community_id;
     let is_mod = CommunityModeratorView::is_community_moderator(

crates/api_crud/src/post/delete.rs

@@ -21,9 +21,7 @@ pub async fn delete_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id)
+  let orig_post = Post::read(&mut context.pool(), post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   // Dont delete it if its already been deleted.
   if orig_post.deleted == data.deleted {

crates/api_crud/src/post/read.rs

@@ -33,16 +33,14 @@ pub async fn get_post(
   } else if let Some(comment_id) = data.comment_id {
     Comment::read(&mut context.pool(), comment_id)
       .await?
-      .ok_or(LemmyErrorType::CouldntFindComment)?
       .post_id
   } else {
-    Err(LemmyErrorType::CouldntFindPost)?
+    Err(LemmyErrorType::NotFound)?
   };
 
   // Check to see if the person is a mod or admin, to show deleted / removed
-  let community_id = Post::read(&mut context.pool(), post_id)
+  let community_id = Post::read_xx(&mut context.pool(), post_id)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?
     .community_id;
 
   let is_mod_or_admin = is_mod_or_admin_opt(
@@ -60,8 +58,7 @@ pub async fn get_post(
     local_user.as_ref(),
     is_mod_or_admin,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   let post_id = post_view.post.id;
   if let Some(person_id) = person_id {
@@ -83,8 +80,7 @@ pub async fn get_post(
     local_user.as_ref(),
     is_mod_or_admin,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
   let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id).await?;
 

crates/api_crud/src/post/remove.rs

@@ -17,7 +17,7 @@ use lemmy_db_schema::{
   traits::{Crud, Reportable},
 };
 use lemmy_db_views::structs::LocalUserView;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 
 #[tracing::instrument(skip(context))]
 pub async fn remove_post(
@@ -26,9 +26,7 @@ pub async fn remove_post(
   local_user_view: LocalUserView,
 ) -> LemmyResult<Json<PostResponse>> {
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id)
+  let orig_post = Post::read(&mut context.pool(), post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_mod_action(
     &local_user_view.person,

crates/api_crud/src/post/update.rs

@@ -85,9 +85,7 @@ pub async fn update_post(
   }
 
   let post_id = data.post_id;
-  let orig_post = Post::read(&mut context.pool(), post_id)
+  let orig_post = Post::read(&mut context.pool(), post_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
 
   check_community_user_action(
     &local_user_view.person,

crates/api_crud/src/private_message/create.rs

@@ -56,16 +56,12 @@ pub async fn create_private_message(
     .await
     .with_lemmy_type(LemmyErrorType::CouldntCreatePrivateMessage)?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), inserted_private_message.id)
+  let view = PrivateMessageView::read(&mut context.pool(), inserted_private_message.id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
 
   // Send email to the local recipient, if one exists
   if view.recipient.local {
     let recipient_id = data.recipient_id;
-    let local_recipient = LocalUserView::read_person(&mut context.pool(), recipient_id)
+    let local_recipient = LocalUserView::read_person(&mut context.pool(), recipient_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?;
     let lang = get_interface_language(&local_recipient);
     let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname());
     let sender_name = &local_user_view.person.name;

crates/api_crud/src/private_message/delete.rs

@@ -20,9 +20,7 @@ pub async fn delete_private_message(
 ) -> LemmyResult<Json<PrivateMessageResponse>> {
   // Checking permissions
   let private_message_id = data.private_message_id;
-  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   if local_user_view.person.id != orig_private_message.creator_id {
     Err(LemmyErrorType::EditPrivateMessageNotAllowed)?
   }
@@ -47,9 +45,7 @@ pub async fn delete_private_message(
   )
   .await?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), private_message_id)
+  let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   Ok(Json(PrivateMessageResponse {
     private_message_view: view,
   }))

crates/api_crud/src/private_message/update.rs

@@ -30,9 +30,7 @@ pub async fn update_private_message(
 
   // Checking permissions
   let private_message_id = data.private_message_id;
-  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id)
+  let orig_private_message = PrivateMessage::read(&mut context.pool(), private_message_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
   if local_user_view.person.id != orig_private_message.creator_id {
     Err(LemmyErrorType::EditPrivateMessageNotAllowed)?
   }
@@ -56,9 +54,7 @@ pub async fn update_private_message(
   .await
   .with_lemmy_type(LemmyErrorType::CouldntUpdatePrivateMessage)?;
 
-  let view = PrivateMessageView::read(&mut context.pool(), private_message_id)
+  let view = PrivateMessageView::read(&mut context.pool(), private_message_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPrivateMessage)?;
 
   ActivityChannel::submit_activity(
     SendActivityData::UpdatePrivateMessage(view.clone()),

crates/api_crud/src/user/create.rs

@@ -234,7 +234,6 @@ pub async fn authenticate_with_oauth(
   let oauth_provider = OAuthProvider::read(&mut context.pool(), oauth_provider_id)
     .await
     .ok()
-    .flatten()
     .ok_or(LemmyErrorType::OauthAuthorizationInvalid)?;
 
   if !oauth_provider.enabled {
@@ -262,10 +261,10 @@ pub async fn authenticate_with_oauth(
 
   // Lookup user by oauth_user_id
   let mut local_user_view =
-    LocalUserView::find_by_oauth_id(&mut context.pool(), oauth_provider.id, &oauth_user_id).await?;
+    LocalUserView::find_by_oauth_id(&mut context.pool(), oauth_provider.id, &oauth_user_id).await;
 
   let local_user: LocalUser;
-  if let Some(user_view) = local_user_view {
+  if let Ok(user_view) = local_user_view {
     // user found by oauth_user_id => Login user
     local_user = user_view.clone().local_user;
 
@@ -292,10 +291,10 @@ pub async fn authenticate_with_oauth(
       local_site.registration_mode == RegistrationMode::RequireApplication;
 
     // Lookup user by OAUTH email and link accounts
-    local_user_view = LocalUserView::find_by_email(&mut context.pool(), &email).await?;
+    local_user_view = LocalUserView::find_by_email(&mut context.pool(), &email).await;
 
     let person;
-    if let Some(user_view) = local_user_view {
+    if let Ok(user_view) = local_user_view {
       // user found by email => link and login if linking is allowed
 
       // we only allow linking by email when email_verification is required otherwise emails cannot

crates/apub/src/activities/block/mod.rs

@@ -22,10 +22,7 @@ use lemmy_db_schema::{
   traits::Crud,
   utils::DbPool,
 };
-use lemmy_utils::{
+use lemmy_utils::error::{LemmyError, LemmyResult};
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
 use serde::Deserialize;
 use url::Url;
 
@@ -182,7 +179,6 @@ pub(crate) async fn send_ban_from_community(
 ) -> LemmyResult<()> {
   let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   let expires = check_expire_time(data.expires)?;
 

crates/apub/src/activities/community/announce.rs

@@ -220,7 +220,7 @@ async fn can_accept_activity_in_community(
     }
     // Local only community can't federate
     if community.visibility != CommunityVisibility::Public {
-      return Err(LemmyErrorType::CouldntFindCommunity.into());
+      return Err(LemmyErrorType::NotFound.into());
     }
   }
   Ok(())

crates/apub/src/activities/community/collection_add.rs

@@ -36,10 +36,7 @@ use lemmy_db_schema::{
   },
   traits::{Crud, Joinable},
 };
-use lemmy_utils::{
+use lemmy_utils::error::{LemmyError, LemmyResult};
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
 use url::Url;
 
 impl CollectionAdd {
@@ -129,9 +126,7 @@ impl ActivityHandler for CollectionAdd {
   async fn receive(self, context: &Data<Self::DataType>) -> LemmyResult<()> {
     insert_received_activity(&self.id, context).await?;
     let (community, collection_type) =
-      Community::get_by_collection_url(&mut context.pool(), &self.target.into())
+      Community::get_by_collection_url(&mut context.pool(), &self.target.into()).await?;
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     match collection_type {
       CollectionType::Moderators => {
         let new_mod = ObjectId::<ApubPerson>::from(self.object)
@@ -188,11 +183,9 @@ pub(crate) async fn send_add_mod_to_community(
   let actor: ApubPerson = actor.into();
   let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   let updated_mod: ApubPerson = Person::read(&mut context.pool(), updated_mod_id)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?
     .into();
   if added {
     CollectionAdd::send_add_mod(&community, &updated_mod, &actor, &context).await
@@ -211,7 +204,6 @@ pub(crate) async fn send_feature_post(
   let post: ApubPost = post.into();
   let community = Community::read(&mut context.pool(), post.community_id)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   if featured {
     CollectionAdd::send_add_featured_post(&community, &post, &actor, &context).await

crates/apub/src/activities/community/collection_remove.rs

@@ -31,10 +31,7 @@ use lemmy_db_schema::{
   },
   traits::{Crud, Joinable},
 };
-use lemmy_utils::{
+use lemmy_utils::error::{LemmyError, LemmyResult};
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
 use url::Url;
 
 impl CollectionRemove {
@@ -124,9 +121,7 @@ impl ActivityHandler for CollectionRemove {
   async fn receive(self, context: &Data<Self::DataType>) -> LemmyResult<()> {
     insert_received_activity(&self.id, context).await?;
     let (community, collection_type) =
-      Community::get_by_collection_url(&mut context.pool(), &self.target.into())
+      Community::get_by_collection_url(&mut context.pool(), &self.target.into()).await?;
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     match collection_type {
       CollectionType::Moderators => {
         let remove_mod = ObjectId::<ApubPerson>::from(self.object)

crates/apub/src/activities/community/lock_page.rs

@@ -32,10 +32,7 @@ use lemmy_db_schema::{
   },
   traits::Crud,
 };
-use lemmy_utils::{
+use lemmy_utils::error::{LemmyError, LemmyResult};
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
 use url::Url;
 
 #[async_trait::async_trait]
@@ -132,7 +129,6 @@ pub(crate) async fn send_lock_post(
 ) -> LemmyResult<()> {
   let community: ApubCommunity = Community::read(&mut context.pool(), post.community_id)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?
     .into();
   let id = generate_activity_id(
     LockType::Lock,

crates/apub/src/activities/community/report.rs

@@ -29,10 +29,7 @@ use lemmy_db_schema::{
   },
   traits::{Crud, Reportable},
 };
-use lemmy_utils::{
+use lemmy_utils::error::{LemmyError, LemmyResult};
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
 use url::Url;
 
 impl Report {
@@ -70,9 +67,7 @@ impl Report {
       PostOrComment::Post(p) => p.creator_id,
       PostOrComment::Comment(c) => c.creator_id,
     };
-    let object_creator = Person::read(&mut context.pool(), object_creator_id)
+    let object_creator = Person::read(&mut context.pool(), object_creator_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?;
     let object_creator_site: Option<ApubSite> =
       Site::read_from_instance_id(&mut context.pool(), object_creator.instance_id)
         .await?

crates/apub/src/activities/create_or_update/comment.rs

@@ -42,7 +42,6 @@ use lemmy_db_schema::{
 use lemmy_utils::{
   error::{LemmyError, LemmyResult},
   utils::mention::scrape_text_for_mentions,
-  LemmyErrorType,
 };
 use url::Url;
 
@@ -56,17 +55,11 @@ impl CreateOrUpdateNote {
   ) -> LemmyResult<()> {
     // TODO: might be helpful to add a comment method to retrieve community directly
     let post_id = comment.post_id;
-    let post = Post::read(&mut context.pool(), post_id)
+    let post = Post::read(&mut context.pool(), post_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPost)?;
     let community_id = post.community_id;
-    let person: ApubPerson = Person::read(&mut context.pool(), person_id)
+    let person: ApubPerson = Person::read(&mut context.pool(), person_id).await?.into();
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?
-      .into();
     let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
       .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
 
     let id = generate_activity_id(

crates/apub/src/activities/create_or_update/post.rs

@@ -32,7 +32,7 @@ use lemmy_db_schema::{
   },
   traits::{Crud, Likeable},
 };
-use lemmy_utils::error::{LemmyError, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyError, LemmyResult};
 use url::Url;
 
 impl CreateOrUpdatePage {
@@ -66,13 +66,9 @@ impl CreateOrUpdatePage {
     context: Data<LemmyContext>,
   ) -> LemmyResult<()> {
     let community_id = post.community_id;
-    let person: ApubPerson = Person::read(&mut context.pool(), person_id)
+    let person: ApubPerson = Person::read(&mut context.pool(), person_id).await?.into();
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?
-      .into();
     let community: ApubCommunity = Community::read(&mut context.pool(), community_id)
       .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?
       .into();
 
     let create_or_update =

crates/apub/src/activities/deletion/delete.rs

@@ -176,8 +176,8 @@ pub(in crate::activities) async fn receive_remove_action(
       .await?;
     }
     // TODO these need to be implemented yet, for now, return errors
-    DeletableObjects::PrivateMessage(_) => Err(LemmyErrorType::CouldntFindPrivateMessage)?,
+    DeletableObjects::PrivateMessage(_) => Err(LemmyErrorType::NotFound)?,
-    DeletableObjects::Person(_) => Err(LemmyErrorType::CouldntFindPerson)?,
+    DeletableObjects::Person(_) => Err(LemmyErrorType::NotFound)?,
   }
   Ok(())
 }

crates/apub/src/activities/deletion/mod.rs

@@ -39,7 +39,7 @@ use lemmy_db_schema::{
   },
   traits::Crud,
 };
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use std::ops::Deref;
 use url::Url;
 
@@ -87,7 +87,6 @@ pub(crate) async fn send_apub_delete_private_message(
   let recipient_id = pm.recipient_id;
   let recipient: ApubPerson = Person::read(&mut context.pool(), recipient_id)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?
     .into();
 
   let deletable = DeletableObjects::PrivateMessage(pm.into());

crates/apub/src/activities/deletion/undo_delete.rs

@@ -156,8 +156,8 @@ impl UndoDelete {
         .await?;
       }
       // TODO these need to be implemented yet, for now, return errors
-      DeletableObjects::PrivateMessage(_) => Err(LemmyErrorType::CouldntFindPrivateMessage)?,
+      DeletableObjects::PrivateMessage(_) => Err(LemmyErrorType::NotFound)?,
-      DeletableObjects::Person(_) => Err(LemmyErrorType::CouldntFindPerson)?,
+      DeletableObjects::Person(_) => Err(LemmyErrorType::NotFound)?,
     }
     Ok(())
   }

crates/apub/src/activities/following/follow.rs

@@ -106,7 +106,7 @@ impl ActivityHandler for Follow {
       UserOrCommunity::Community(c) => {
         // Dont allow following local-only community via federation.
         if c.visibility != CommunityVisibility::Public {
-          return Err(LemmyErrorType::CouldntFindCommunity.into());
+          return Err(LemmyErrorType::NotFound.into());
         }
         let form = CommunityFollowerForm {
           community_id: c.id,

crates/apub/src/activities/mod.rs

@@ -245,9 +245,7 @@ pub async fn match_outgoing_activities(
         CreateOrUpdatePage::send(post, creator_id, CreateOrUpdateType::Update, context).await
       }
       DeletePost(post, person, data) => {
-        let community = Community::read(&mut context.pool(), post.community_id)
+        let community = Community::read(&mut context.pool(), post.community_id).await?;
-          .await?
-          .ok_or(LemmyErrorType::CouldntFindCommunity)?;
         send_apub_delete_in_community(
           person,
           community,
@@ -264,9 +262,7 @@ pub async fn match_outgoing_activities(
         reason,
         removed,
       } => {
-        let community = Community::read(&mut context.pool(), post.community_id)
+        let community = Community::read(&mut context.pool(), post.community_id).await?;
-          .await?
-          .ok_or(LemmyErrorType::CouldntFindCommunity)?;
         send_apub_delete_in_community(
           moderator,
           community,

crates/apub/src/activity_lists.rs

@@ -117,7 +117,7 @@ impl InCommunity for AnnouncableActivities {
       CollectionRemove(a) => a.community(context).await,
       LockPost(a) => a.community(context).await,
       UndoLockPost(a) => a.community(context).await,
-      Page(_) => Err(LemmyErrorType::CouldntFindPost.into()),
+      Page(_) => Err(LemmyErrorType::NotFound.into()),
     }
   }
 }

crates/apub/src/api/list_comments.rs

@@ -64,12 +64,7 @@ pub async fn list_comments(
 
   // If a parent_id is given, fetch the comment to get the path
   let parent_path = if let Some(parent_id) = parent_id {
-    Some(
+    Some(Comment::read(&mut context.pool(), parent_id).await?.path)
-      Comment::read(&mut context.pool(), parent_id)
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindComment)?
-        .path,
-    )
   } else {
     None
   };

crates/apub/src/api/read_community.rs

@@ -13,7 +13,7 @@ use lemmy_db_schema::source::{
 };
 use lemmy_db_views::structs::LocalUserView;
 use lemmy_db_views_actor::structs::{CommunityModeratorView, CommunityView};
-use lemmy_utils::error::{LemmyErrorExt, LemmyErrorExt2, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 #[tracing::instrument(skip(context))]
 pub async fn get_community(
@@ -36,8 +36,7 @@ pub async fn get_community(
     None => {
       let name = data.name.clone().unwrap_or_else(|| "main".to_string());
       resolve_actor_identifier::<ApubCommunity, Community>(&name, &context, &local_user_view, true)
-        .await
+        .await?
-        .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?
         .id
     }
   };
@@ -56,12 +55,9 @@ pub async fn get_community(
     local_user,
     is_mod_or_admin,
   )
-  .await?
+  .await?;
-  .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
-  let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id)
+  let moderators = CommunityModeratorView::for_community(&mut context.pool(), community_id).await?;
-    .await
-    .with_lemmy_type(LemmyErrorType::CouldntFindCommunity)?;
 
   let site = read_site_for_actor(community_view.community.actor_id.clone(), &context).await?;
 

crates/apub/src/api/read_person.rs

@@ -13,7 +13,7 @@ use lemmy_db_views::{
   structs::{LocalUserView, SiteView},
 };
 use lemmy_db_views_actor::structs::{CommunityModeratorView, PersonView};
-use lemmy_utils::error::{LemmyErrorExt2, LemmyErrorType, LemmyResult};
+use lemmy_utils::error::{LemmyErrorType, LemmyResult};
 
 #[tracing::instrument(skip(context))]
 pub async fn read_person(
@@ -35,20 +35,17 @@ pub async fn read_person(
     None => {
       if let Some(username) = &data.username {
         resolve_actor_identifier::<ApubPerson, Person>(username, &context, &local_user_view, true)
-          .await
+          .await?
-          .with_lemmy_type(LemmyErrorType::CouldntFindPerson)?
           .id
       } else {
-        Err(LemmyErrorType::CouldntFindPerson)?
+        Err(LemmyErrorType::NotFound)?
       }
     }
   };
 
   // You don't need to return settings for the user, since this comes back with GetSite
   // `my_user`
-  let person_view = PersonView::read(&mut context.pool(), person_details_id)
+  let person_view = PersonView::read(&mut context.pool(), person_details_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
   let sort = data.sort;
   let page = data.page;

crates/apub/src/api/resolve_object.rs

@@ -34,11 +34,11 @@ pub async fn resolve_object(
     // user isn't authenticated only allow a local search.
     search_query_to_object_id_local(&data.q, &context).await
   }
-  .with_lemmy_type(LemmyErrorType::CouldntFindObject)?;
+  .with_lemmy_type(LemmyErrorType::NotFound)?;
 
   convert_response(res, local_user_view, &mut context.pool())
     .await
-    .with_lemmy_type(LemmyErrorType::CouldntFindObject)
+    .with_lemmy_type(LemmyErrorType::NotFound)
 }
 
 async fn convert_response(
@@ -54,36 +54,20 @@ async fn convert_response(
   match object {
     Post(p) => {
       removed_or_deleted = p.deleted || p.removed;
-      res.post = Some(
+      res.post = Some(PostView::read(pool, p.id, local_user.as_ref(), false).await?)
-        PostView::read(pool, p.id, local_user.as_ref(), false)
-          .await?
-          .ok_or(LemmyErrorType::CouldntFindPost)?,
-      )
     }
     Comment(c) => {
       removed_or_deleted = c.deleted || c.removed;
-      res.comment = Some(
+      res.comment = Some(CommentView::read(pool, c.id, local_user.as_ref()).await?)
-        CommentView::read(pool, c.id, local_user.as_ref())
-          .await?
-          .ok_or(LemmyErrorType::CouldntFindComment)?,
-      )
     }
     PersonOrCommunity(p) => match *p {
       UserOrCommunity::User(u) => {
         removed_or_deleted = u.deleted;
-        res.person = Some(
+        res.person = Some(PersonView::read(pool, u.id).await?)
-          PersonView::read(pool, u.id)
-            .await?
-            .ok_or(LemmyErrorType::CouldntFindPerson)?,
-        )
       }
       UserOrCommunity::Community(c) => {
         removed_or_deleted = c.deleted || c.removed;
-        res.community = Some(
+        res.community = Some(CommunityView::read(pool, c.id, local_user.as_ref(), false).await?)
-          CommunityView::read(pool, c.id, local_user.as_ref(), false)
-            .await?
-            .ok_or(LemmyErrorType::CouldntFindCommunity)?,
-        )
       }
     },
   };

crates/apub/src/api/user_settings_backup.rs

@@ -348,11 +348,7 @@ mod tests {
     let user_form = LocalUserInsertForm::test_form(person.id);
     let local_user = LocalUser::create(&mut context.pool(), &user_form, vec![]).await?;
 
-    Ok(
+    Ok(LocalUserView::read(&mut context.pool(), local_user.id).await?)
-      LocalUserView::read(&mut context.pool(), local_user.id)
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindLocalUser)?,
-    )
   }
 
   #[tokio::test]
@@ -386,9 +382,8 @@ mod tests {
     // wait for background task to finish
     sleep(Duration::from_millis(1000)).await;
 
-    let import_user_updated = LocalUserView::read(&mut context.pool(), import_user.local_user.id)
+    let import_user_updated =
-      .await?
+      LocalUserView::read(&mut context.pool(), import_user.local_user.id).await?;
-      .ok_or(LemmyErrorType::CouldntFindLocalUser)?;
 
     assert_eq!(
       export_user.person.display_name,

crates/apub/src/fetcher/post_or_comment.rs

@@ -12,10 +12,7 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::{
+use lemmy_utils::error::{LemmyError, LemmyResult};
-  error::{LemmyError, LemmyResult},
-  LemmyErrorType,
-};
 use serde::Deserialize;
 use url::Url;
 
@@ -97,15 +94,9 @@ impl InCommunity for PostOrComment {
       PostOrComment::Comment(c) => {
         Post::read(&mut context.pool(), c.post_id)
           .await?
-          .ok_or(LemmyErrorType::CouldntFindPost)?
           .community_id
       }
     };
-    Ok(
+    Ok(Community::read(&mut context.pool(), cid).await?.into())
-      Community::read(&mut context.pool(), cid)
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindCommunity)?
-        .into(),
-    )
   }
 }

crates/apub/src/http/comment.rs

@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   source::{comment::Comment, community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
@@ -31,16 +31,9 @@ pub(crate) async fn get_apub_comment(
 ) -> LemmyResult<HttpResponse> {
   let id = CommentId(info.comment_id.parse::<i32>()?);
   // Can't use CommentView here because it excludes deleted/removed/local-only items
-  let comment: ApubComment = Comment::read(&mut context.pool(), id)
+  let comment: ApubComment = Comment::read(&mut context.pool(), id).await?.into();
-    .await?
+  let post = Post::read(&mut context.pool(), comment.post_id).await?;
-    .ok_or(LemmyErrorType::CouldntFindComment)?
+  let community = Community::read(&mut context.pool(), post.community_id).await?;
-    .into();
-  let post = Post::read(&mut context.pool(), comment.post_id)
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindPost)?;
-  let community = Community::read(&mut context.pool(), post.community_id)
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   check_community_public(&community)?;
 
   if !comment.local {

crates/apub/src/http/community.rs

@@ -35,7 +35,7 @@ pub(crate) async fn get_apub_community_http(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, true)
       .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?
+      .ok_or(LemmyErrorType::NotFound)?
       .into();
 
   if community.deleted || community.removed {
@@ -67,7 +67,7 @@ pub(crate) async fn get_apub_community_followers(
 ) -> LemmyResult<HttpResponse> {
   let community = Community::read_from_name(&mut context.pool(), &info.community_name, false)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
+    .ok_or(LemmyErrorType::NotFound)?;
   check_community_public(&community)?;
   let followers = ApubCommunityFollower::read_local(&community.into(), &context).await?;
   create_apub_response(&followers)
@@ -82,7 +82,7 @@ pub(crate) async fn get_apub_community_outbox(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, false)
       .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?
+      .ok_or(LemmyErrorType::NotFound)?
       .into();
   check_community_public(&community)?;
   let outbox = ApubCommunityOutbox::read_local(&community, &context).await?;
@@ -97,7 +97,7 @@ pub(crate) async fn get_apub_community_moderators(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, false)
       .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?
+      .ok_or(LemmyErrorType::NotFound)?
       .into();
   check_community_public(&community)?;
   let moderators = ApubCommunityModerators::read_local(&community, &context).await?;
@@ -112,7 +112,7 @@ pub(crate) async fn get_apub_community_featured(
   let community: ApubCommunity =
     Community::read_from_name(&mut context.pool(), &info.community_name, false)
       .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?
+      .ok_or(LemmyErrorType::NotFound)?
       .into();
   check_community_public(&community)?;
   let featured = ApubCommunityFeatured::read_local(&community, &context).await?;

crates/apub/src/http/mod.rs

@@ -106,9 +106,7 @@ pub(crate) async fn get_activity(
     info.id
   ))?
   .into();
-  let activity = SentActivity::read_from_apub_id(&mut context.pool(), &activity_id)
+  let activity = SentActivity::read_from_apub_id(&mut context.pool(), &activity_id).await?;
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindActivity)?;
 
   let sensitive = activity.sensitive;
   if sensitive {
@@ -124,7 +122,7 @@ fn check_community_public(community: &Community) -> LemmyResult<()> {
     Err(LemmyErrorType::Deleted)?
   }
   if community.visibility != CommunityVisibility::Public {
-    return Err(LemmyErrorType::CouldntFindCommunity.into());
+    return Err(LemmyErrorType::NotFound.into());
   }
   Ok(())
 }

crates/apub/src/http/person.rs

@@ -32,7 +32,7 @@ pub(crate) async fn get_apub_person_http(
   // TODO: this needs to be able to read deleted persons, so that it can send tombstones
   let person: ApubPerson = Person::read_from_name(&mut context.pool(), &user_name, true)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?
+    .ok_or(LemmyErrorType::NotFound)?
     .into();
 
   if !person.deleted {
@@ -63,7 +63,7 @@ pub(crate) async fn get_apub_person_outbox(
 ) -> LemmyResult<HttpResponse> {
   let person = Person::read_from_name(&mut context.pool(), &info.user_name, false)
     .await?
-    .ok_or(LemmyErrorType::CouldntFindPerson)?;
+    .ok_or(LemmyErrorType::NotFound)?;
   let outbox_id = generate_outbox_url(&person.actor_id)?.into();
   let outbox = EmptyOutbox::new(outbox_id)?;
   create_apub_response(&outbox)

crates/apub/src/http/post.rs

@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::Deserialize;
 
 #[derive(Deserialize)]
@@ -31,13 +31,8 @@ pub(crate) async fn get_apub_post(
 ) -> LemmyResult<HttpResponse> {
   let id = PostId(info.post_id.parse::<i32>()?);
   // Can't use PostView here because it excludes deleted/removed/local-only items
-  let post: ApubPost = Post::read(&mut context.pool(), id)
+  let post: ApubPost = Post::read(&mut context.pool(), id).await?.into();
-    .await?
+  let community = Community::read(&mut context.pool(), post.community_id).await?;
-    .ok_or(LemmyErrorType::CouldntFindPost)?
-    .into();
-  let community = Community::read(&mut context.pool(), post.community_id)
-    .await?
-    .ok_or(LemmyErrorType::CouldntFindCommunity)?;
   check_community_public(&community)?;
 
   if !post.local {

crates/apub/src/mentions.rs

@@ -99,21 +99,12 @@ async fn get_comment_parent_creator(
   comment: &Comment,
 ) -> LemmyResult<ApubPerson> {
   let parent_creator_id = if let Some(parent_comment_id) = comment.parent_comment_id() {
-    let parent_comment = Comment::read(pool, parent_comment_id)
+    let parent_comment = Comment::read(pool, parent_comment_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindComment)?;
     parent_comment.creator_id
   } else {
     let parent_post_id = comment.post_id;
-    let parent_post = Post::read(pool, parent_post_id)
+    let parent_post = Post::read(pool, parent_post_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPost)?;
     parent_post.creator_id
   };
-  Ok(
+  Ok(Person::read(pool, parent_creator_id).await?.into())
-    Person::read(pool, parent_creator_id)
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?
-      .into(),
-  )
 }

crates/apub/src/objects/comment.rs

@@ -91,23 +91,15 @@ impl Object for ApubComment {
   #[tracing::instrument(skip_all)]
   async fn into_json(self, context: &Data<Self::DataType>) -> LemmyResult<Note> {
     let creator_id = self.creator_id;
-    let creator = Person::read(&mut context.pool(), creator_id)
+    let creator = Person::read(&mut context.pool(), creator_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
     let post_id = self.post_id;
-    let post = Post::read(&mut context.pool(), post_id)
+    let post = Post::read(&mut context.pool(), post_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPost)?;
     let community_id = post.community_id;
-    let community = Community::read(&mut context.pool(), community_id)
+    let community = Community::read(&mut context.pool(), community_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
 
     let in_reply_to = if let Some(comment_id) = self.parent_comment_id() {
-      let parent_comment = Comment::read(&mut context.pool(), comment_id)
+      let parent_comment = Comment::read(&mut context.pool(), comment_id).await?;
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindComment)?;
       parent_comment.ap_id.into()
     } else {
       post.ap_id.into()

crates/apub/src/objects/post.rs

@@ -107,13 +107,9 @@ impl Object for ApubPost {
   #[tracing::instrument(skip_all)]
   async fn into_json(self, context: &Data<Self::DataType>) -> LemmyResult<Page> {
     let creator_id = self.creator_id;
-    let creator = Person::read(&mut context.pool(), creator_id)
+    let creator = Person::read(&mut context.pool(), creator_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?;
     let community_id = self.community_id;
-    let community = Community::read(&mut context.pool(), community_id)
+    let community = Community::read(&mut context.pool(), community_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     let language = LanguageTag::new_single(self.language_id, &mut context.pool()).await?;
 
     let attachment = self

crates/apub/src/objects/private_message.rs

@@ -73,20 +73,16 @@ impl Object for ApubPrivateMessage {
 
   async fn delete(self, _context: &Data<Self::DataType>) -> LemmyResult<()> {
     // do nothing, because pm can't be fetched over http
-    Err(LemmyErrorType::CouldntFindPrivateMessage.into())
+    Err(LemmyErrorType::NotFound.into())
   }
 
   #[tracing::instrument(skip_all)]
   async fn into_json(self, context: &Data<Self::DataType>) -> LemmyResult<ChatMessage> {
     let creator_id = self.creator_id;
-    let creator = Person::read(&mut context.pool(), creator_id)
+    let creator = Person::read(&mut context.pool(), creator_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
     let recipient_id = self.recipient_id;
-    let recipient = Person::read(&mut context.pool(), recipient_id)
+    let recipient = Person::read(&mut context.pool(), recipient_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindPerson)?;
 
     let note = ChatMessage {
       r#type: ChatMessageType::ChatMessage,

crates/apub/src/protocol/activities/community/collection_add.rs

@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::source::community::Community;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -35,9 +35,7 @@ pub struct CollectionAdd {
 impl InCommunity for CollectionAdd {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let (community, _) =
-      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into())
+      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into()).await?;
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }

crates/apub/src/protocol/activities/community/collection_remove.rs

@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::source::community::Community;
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -35,9 +35,7 @@ pub struct CollectionRemove {
 impl InCommunity for CollectionRemove {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let (community, _) =
-      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into())
+      Community::get_by_collection_url(&mut context.pool(), &self.clone().target.into()).await?;
-        .await?
-        .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }

crates/apub/src/protocol/activities/community/lock_page.rs

@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{source::community::Community, traits::Crud};
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use strum::Display;
 use url::Url;
@@ -55,9 +55,7 @@ pub struct UndoLockPage {
 impl InCommunity for LockPage {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let post = self.object.dereference(context).await?;
-    let community = Community::read(&mut context.pool(), post.community_id)
+    let community = Community::read(&mut context.pool(), post.community_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }

crates/apub/src/protocol/activities/community/report.rs

@@ -38,7 +38,7 @@ impl Report {
       .summary
       .clone()
       .or(self.content.clone())
-      .ok_or(LemmyErrorType::CouldntFindObject.into())
+      .ok_or(LemmyErrorType::NotFound.into())
   }
 }
 
@@ -63,7 +63,7 @@ impl ReportObject {
             return deref;
           }
         }
-        Err(LemmyErrorType::CouldntFindObject.into())
+        Err(LemmyErrorType::NotFound.into())
       }
     }
   }

crates/apub/src/protocol/activities/create_or_update/note.rs

@@ -11,7 +11,7 @@ use activitypub_federation::{
 };
 use lemmy_api_common::context::LemmyContext;
 use lemmy_db_schema::{source::community::Community, traits::Crud};
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use url::Url;
 
@@ -36,9 +36,7 @@ pub struct CreateOrUpdateNote {
 impl InCommunity for CreateOrUpdateNote {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let post = self.object.get_parents(context).await?.0;
-    let community = Community::read(&mut context.pool(), post.community_id)
+    let community = Community::read(&mut context.pool(), post.community_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }

crates/apub/src/protocol/activities/deletion/delete.rs

@@ -15,7 +15,7 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use url::Url;
@@ -51,9 +51,7 @@ impl InCommunity for Delete {
     let community_id = match DeletableObjects::read_from_db(self.object.id(), context).await? {
       DeletableObjects::Community(c) => c.id,
       DeletableObjects::Comment(c) => {
-        let post = Post::read(&mut context.pool(), c.post_id)
+        let post = Post::read(&mut context.pool(), c.post_id).await?;
-          .await?
-          .ok_or(LemmyErrorType::CouldntFindPost)?;
         post.community_id
       }
       DeletableObjects::Post(p) => p.community_id,
@@ -62,9 +60,7 @@ impl InCommunity for Delete {
         return Err(anyhow!("Private message is not part of community").into())
       }
     };
-    let community = Community::read(&mut context.pool(), community_id)
+    let community = Community::read(&mut context.pool(), community_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }

crates/apub/src/protocol/objects/note.rs

@@ -20,7 +20,7 @@ use lemmy_db_schema::{
   source::{community::Community, post::Post},
   traits::Crud,
 };
-use lemmy_utils::{error::LemmyResult, LemmyErrorType};
+use lemmy_utils::error::LemmyResult;
 use serde::{Deserialize, Serialize};
 use serde_with::skip_serializing_none;
 use std::ops::Deref;
@@ -64,9 +64,7 @@ impl Note {
       PostOrComment::Post(p) => Ok((p.clone(), None)),
       PostOrComment::Comment(c) => {
         let post_id = c.post_id;
-        let post = Post::read(&mut context.pool(), post_id)
+        let post = Post::read(&mut context.pool(), post_id).await?;
-          .await?
-          .ok_or(LemmyErrorType::CouldntFindPost)?;
         Ok((post.into(), Some(c.clone())))
       }
     }
@@ -77,9 +75,7 @@ impl Note {
 impl InCommunity for Note {
   async fn community(&self, context: &Data<LemmyContext>) -> LemmyResult<ApubCommunity> {
     let (post, _) = self.get_parents(context).await?;
-    let community = Community::read(&mut context.pool(), post.community_id)
+    let community = Community::read(&mut context.pool(), post.community_id).await?;
-      .await?
-      .ok_or(LemmyErrorType::CouldntFindCommunity)?;
     if let Some(audience) = &self.audience {
       verify_community_matches(audience, community.actor_id.clone())?;
     }

crates/apub/src/protocol/objects/page.rs

@@ -226,7 +226,7 @@ impl InCommunity for Page {
               break c;
             }
           } else {
-            Err(LemmyErrorType::CouldntFindCommunity)?;
+            Err(LemmyErrorType::NotFound)?;
           }
         }
       }
@@ -234,7 +234,7 @@ impl InCommunity for Page {
         p.iter()
           .find(|a| a.kind == PersonOrGroupType::Group)
           .map(|a| ObjectId::<ApubCommunity>::from(a.id.clone().into_inner()))
-          .ok_or(LemmyErrorType::CouldntFindCommunity)?
+          .ok_or(LemmyErrorType::NotFound)?
           .dereference(context)
           .await?
       }

crates/db_schema/src/aggregates/comment_aggregates.rs

@@ -1,6 +1,5 @@
 use crate::{
   aggregates::structs::CommentAggregates,
-  diesel::OptionalExtension,
   newtypes::CommentId,
   schema::comment_aggregates,
   utils::{functions::hot_rank, get_conn, DbPool},
@@ -9,13 +8,9 @@ use diesel::{result::Error, ExpressionMethods, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl CommentAggregates {
-  pub async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result<Option<Self>, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
-    comment_aggregates::table
+    comment_aggregates::table.find(comment_id).first(conn).await
-      .find(comment_id)
-      .first(conn)
-      .await
-      .optional()
   }
 
   pub async fn update_hot_rank(
@@ -115,7 +110,6 @@ mod tests {
 
     let comment_aggs_before_delete = CommentAggregates::read(pool, inserted_comment.id)
       .await
-      .unwrap()
       .unwrap();
 
     assert_eq!(1, comment_aggs_before_delete.score);
@@ -134,7 +128,6 @@ mod tests {
 
     let comment_aggs_after_dislike = CommentAggregates::read(pool, inserted_comment.id)
       .await
-      .unwrap()
       .unwrap();
 
     assert_eq!(0, comment_aggs_after_dislike.score);
@@ -147,7 +140,6 @@ mod tests {
       .unwrap();
     let after_like_remove = CommentAggregates::read(pool, inserted_comment.id)
       .await
-      .unwrap()
       .unwrap();
     assert_eq!(-1, after_like_remove.score);
     assert_eq!(0, after_like_remove.upvotes);
@@ -157,10 +149,8 @@ mod tests {
     Post::delete(pool, inserted_post.id).await.unwrap();
 
     // Should be none found, since the post was deleted
-    let after_delete = CommentAggregates::read(pool, inserted_comment.id)
+    let after_delete = CommentAggregates::read(pool, inserted_comment.id).await;
-      .await
+    assert!(after_delete.is_err());
-      .unwrap();
-    assert!(after_delete.is_none());
 
     // This should delete all the associated rows, and fire triggers
     Person::delete(pool, another_inserted_person.id)

crates/db_schema/src/aggregates/post_aggregates.rs

@@ -1,6 +1,5 @@
 use crate::{
   aggregates::structs::PostAggregates,
-  diesel::OptionalExtension,
   newtypes::PostId,
   schema::{community_aggregates, post, post_aggregates},
   utils::{
@@ -13,13 +12,9 @@ use diesel::{result::Error, ExpressionMethods, JoinOnDsl, QueryDsl};
 use diesel_async::RunQueryDsl;
 
 impl PostAggregates {
-  pub async fn read(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Option<Self>, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Self, Error> {
     let conn = &mut get_conn(pool).await?;
-    post_aggregates::table
+    post_aggregates::table.find(post_id).first(conn).await
-      .find(post_id)
-      .first(conn)
-      .await
-      .optional()
   }
 
   pub async fn update_ranks(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Self, Error> {
@@ -131,10 +126,7 @@ mod tests {
 
     PostLike::like(pool, &post_like).await.unwrap();
 
-    let post_aggs_before_delete = PostAggregates::read(pool, inserted_post.id)
+    let post_aggs_before_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .await
-      .unwrap()
-      .unwrap();
 
     assert_eq!(2, post_aggs_before_delete.comments);
     assert_eq!(1, post_aggs_before_delete.score);
@@ -150,10 +142,7 @@ mod tests {
 
     PostLike::like(pool, &post_dislike).await.unwrap();
 
-    let post_aggs_after_dislike = PostAggregates::read(pool, inserted_post.id)
+    let post_aggs_after_dislike = PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .await
-      .unwrap()
-      .unwrap();
 
     assert_eq!(2, post_aggs_after_dislike.comments);
     assert_eq!(0, post_aggs_after_dislike.score);
@@ -165,10 +154,7 @@ mod tests {
     Comment::delete(pool, inserted_child_comment.id)
       .await
       .unwrap();
-    let after_comment_delete = PostAggregates::read(pool, inserted_post.id)
+    let after_comment_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .await
-      .unwrap()
-      .unwrap();
     assert_eq!(0, after_comment_delete.comments);
     assert_eq!(0, after_comment_delete.score);
     assert_eq!(1, after_comment_delete.upvotes);
@@ -178,10 +164,7 @@ mod tests {
     PostLike::remove(pool, inserted_person.id, inserted_post.id)
       .await
       .unwrap();
-    let after_like_remove = PostAggregates::read(pool, inserted_post.id)
+    let after_like_remove = PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .await
-      .unwrap()
-      .unwrap();
     assert_eq!(0, after_like_remove.comments);
     assert_eq!(-1, after_like_remove.score);
     assert_eq!(0, after_like_remove.upvotes);
@@ -201,8 +184,8 @@ mod tests {
     assert_eq!(1, community_num_deleted);
 
     // Should be none found, since the creator was deleted
-    let after_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+    let after_delete = PostAggregates::read(pool, inserted_post.id).await;
-    assert!(after_delete.is_none());
+    assert!(after_delete.is_err());
 
     Instance::delete(pool, inserted_instance.id).await.unwrap();
   }
@@ -244,10 +227,7 @@ mod tests {
 
     let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
 
-    let post_aggregates_before = PostAggregates::read(pool, inserted_post.id)
+    let post_aggregates_before = PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .await
-      .unwrap()
-      .unwrap();
     assert_eq!(1, post_aggregates_before.comments);
 
     Comment::update(
@@ -261,10 +241,7 @@ mod tests {
     .await
     .unwrap();
 
-    let post_aggregates_after_remove = PostAggregates::read(pool, inserted_post.id)
+    let post_aggregates_after_remove = PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .await
-      .unwrap()
-      .unwrap();
     assert_eq!(0, post_aggregates_after_remove.comments);
 
     Comment::update(
@@ -289,10 +266,7 @@ mod tests {
     .await
     .unwrap();
 
-    let post_aggregates_after_delete = PostAggregates::read(pool, inserted_post.id)
+    let post_aggregates_after_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .await
-      .unwrap()
-      .unwrap();
     assert_eq!(0, post_aggregates_after_delete.comments);
 
     Comment::update(
@@ -306,10 +280,8 @@ mod tests {
     .await
     .unwrap();
 
-    let post_aggregates_after_delete_remove = PostAggregates::read(pool, inserted_post.id)
+    let post_aggregates_after_delete_remove =
-      .await
+      PostAggregates::read(pool, inserted_post.id).await.unwrap();
-      .unwrap()
-      .unwrap();
     assert_eq!(0, post_aggregates_after_delete_remove.comments);
 
     Comment::delete(pool, inserted_comment.id).await.unwrap();