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

[lemmy.git] / crates / api / src / local_user / report_count.rs

diff --git a/crates/api/src/local_user/report_count.rs b/crates/api/src/local_user/report_count.rs
index a07f8c055fa903f0a166da06f059747ba647dd4f..89bedc2624642d801e429570f50fe36c680b39fe 100644 (file)
--- a/crates/api/src/local_user/report_count.rs
+++ b/crates/api/src/local_user/report_count.rs
@@ -1,47 +1,47 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
+  context::LemmyContext,
   person::{GetReportCount, GetReportCountResponse},
-  utils::{blocking, get_local_user_view_from_jwt},
+  utils::local_user_view_from_jwt,
 };
-use lemmy_db_views::structs::{CommentReportView, PostReportView};
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_views::structs::{CommentReportView, PostReportView, PrivateMessageReportView};
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for GetReportCount {
   type Response = GetReportCountResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
+  #[tracing::instrument(skip(context))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
   ) -> Result<GetReportCountResponse, LemmyError> {
     let data: &GetReportCount = 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;
     let community_id = data.community_id;
 
-    let comment_reports = blocking(context.pool(), move |conn| {
-      CommentReportView::get_report_count(conn, person_id, admin, community_id)
-    })
-    .await??;
+    let comment_reports =
+      CommentReportView::get_report_count(&mut context.pool(), person_id, admin, community_id)
+        .await?;
 
-    let post_reports = blocking(context.pool(), move |conn| {
-      PostReportView::get_report_count(conn, person_id, admin, community_id)
-    })
-    .await??;
+    let post_reports =
+      PostReportView::get_report_count(&mut context.pool(), person_id, admin, community_id).await?;
+
+    let private_message_reports = if admin && community_id.is_none() {
+      Some(PrivateMessageReportView::get_report_count(&mut context.pool()).await?)
+    } else {
+      None
+    };
 
-    let res = GetReportCountResponse {
+    Ok(GetReportCountResponse {
       community_id,
       comment_reports,
       post_reports,
-    };
-
-    Ok(res)
+      private_message_reports,
+    })
   }
 }