Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / api / src / comment_report / list.rs

diff --git a/crates/api/src/comment_report/list.rs b/crates/api/src/comment_report/list.rs
index c8678425535538b42bb7daed28ac3233a8cf0ed9..baa1bf45fee3112de801814c1ba6ebec6562c348 100644 (file)
--- a/crates/api/src/comment_report/list.rs
+++ b/crates/api/src/comment_report/list.rs
@@ -2,11 +2,11 @@ use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
   comment::{ListCommentReports, ListCommentReportsResponse},
-  utils::{blocking, get_local_user_view_from_jwt},
+  context::LemmyContext,
+  utils::local_user_view_from_jwt,
 };
-use lemmy_db_views::comment_report_view::CommentReportQueryBuilder;
-use lemmy_utils::{error::LemmyError, ConnectionId};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_views::comment_report_view::CommentReportQuery;
+use lemmy_utils::error::LemmyError;
 
 /// Lists comment reports for a community if an id is supplied
 /// or returns all comment reports for communities a user moderates
@@ -14,15 +14,13 @@ use lemmy_websocket::LemmyContext;
 impl Perform for ListCommentReports {
   type Response = ListCommentReportsResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
+  #[tracing::instrument(skip(context))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
   ) -> Result<ListCommentReportsResponse, LemmyError> {
     let data: &ListCommentReports = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
+    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
 
     let person_id = local_user_view.person.id;
     let admin = local_user_view.person.admin;
@@ -31,18 +29,18 @@ impl Perform for ListCommentReports {
 
     let page = data.page;
     let limit = data.limit;
-    let comment_reports = blocking(context.pool(), move |conn| {
-      CommentReportQueryBuilder::create(conn, person_id, admin)
-        .community_id(community_id)
-        .unresolved_only(unresolved_only)
-        .page(page)
-        .limit(limit)
-        .list()
-    })
-    .await??;
+    let comment_reports = CommentReportQuery::builder()
+      .pool(&mut context.pool())
+      .my_person_id(person_id)
+      .admin(admin)
+      .community_id(community_id)
+      .unresolved_only(unresolved_only)
+      .page(page)
+      .limit(limit)
+      .build()
+      .list()
+      .await?;
 
-    let res = ListCommentReportsResponse { comment_reports };
-
-    Ok(res)
+    Ok(ListCommentReportsResponse { comment_reports })
   }
 }