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

[lemmy.git] / crates / api / src / local_user / notifications / list_replies.rs

diff --git a/crates/api/src/local_user/notifications/list_replies.rs b/crates/api/src/local_user/notifications/list_replies.rs
index 9199421c236377391d7e3f0c0ff18f731098b546..79b0fe223b6ca467b153d3f5a21a2814fd7187ff 100644 (file)
--- a/crates/api/src/local_user/notifications/list_replies.rs
+++ b/crates/api/src/local_user/notifications/list_replies.rs
@@ -1,49 +1,41 @@
 use crate::Perform;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  get_local_user_view_from_jwt,
+  context::LemmyContext,
   person::{GetReplies, GetRepliesResponse},
+  utils::local_user_view_from_jwt,
 };
-use lemmy_db_schema::{from_opt_str_to_opt_enum, SortType};
-use lemmy_db_views::comment_view::CommentQueryBuilder;
-use lemmy_utils::{ConnectionId, LemmyError};
-use lemmy_websocket::LemmyContext;
+use lemmy_db_views_actor::comment_reply_view::CommentReplyQuery;
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for GetReplies {
   type Response = GetRepliesResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<GetRepliesResponse, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<GetRepliesResponse, LemmyError> {
     let data: &GetReplies = self;
-    let local_user_view =
-      get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
-
-    let sort: Option<SortType> = from_opt_str_to_opt_enum(&data.sort);
+    let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
 
+    let sort = data.sort;
     let page = data.page;
     let limit = data.limit;
     let unread_only = data.unread_only;
-    let person_id = local_user_view.person.id;
-    let show_bot_accounts = local_user_view.local_user.show_bot_accounts;
+    let person_id = Some(local_user_view.person.id);
+    let show_bot_accounts = Some(local_user_view.local_user.show_bot_accounts);
 
-    let replies = blocking(context.pool(), move |conn| {
-      CommentQueryBuilder::create(conn)
-        .sort(sort)
-        .unread_only(unread_only)
-        .recipient_id(person_id)
-        .show_bot_accounts(show_bot_accounts)
-        .my_person_id(person_id)
-        .page(page)
-        .limit(limit)
-        .list()
-    })
-    .await??;
+    let replies = CommentReplyQuery::builder()
+      .pool(&mut context.pool())
+      .recipient_id(person_id)
+      .my_person_id(person_id)
+      .sort(sort)
+      .unread_only(unread_only)
+      .show_bot_accounts(show_bot_accounts)
+      .page(page)
+      .limit(limit)
+      .build()
+      .list()
+      .await?;
 
     Ok(GetRepliesResponse { replies })
   }