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

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

diff --git a/crates/api/src/local_user/notifications/unread_count.rs b/crates/api/src/local_user/notifications/unread_count.rs
index 523e9a73febf505f507f4a743869676987f48c3b..21622ddbf922b14c93292e7b98d07402032013c1 100644 (file)
--- a/crates/api/src/local_user/notifications/unread_count.rs
+++ b/crates/api/src/local_user/notifications/unread_count.rs
@@ -7,36 +7,30 @@ use lemmy_api_common::{
 };
 use lemmy_db_views::structs::PrivateMessageView;
 use lemmy_db_views_actor::structs::{CommentReplyView, PersonMentionView};
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::LemmyError;
 
 #[async_trait::async_trait(?Send)]
 impl Perform for GetUnreadCount {
   type Response = GetUnreadCountResponse;
 
-  #[tracing::instrument(skip(context, _websocket_id))]
-  async fn perform(
-    &self,
-    context: &Data<LemmyContext>,
-    _websocket_id: Option<ConnectionId>,
-  ) -> Result<Self::Response, LemmyError> {
+  #[tracing::instrument(skip(context))]
+  async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
     let data = self;
     let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
 
     let person_id = local_user_view.person.id;
 
-    let replies = CommentReplyView::get_unread_replies(context.pool(), person_id).await?;
+    let replies = CommentReplyView::get_unread_replies(&mut context.pool(), person_id).await?;
 
-    let mentions = PersonMentionView::get_unread_mentions(context.pool(), person_id).await?;
+    let mentions = PersonMentionView::get_unread_mentions(&mut context.pool(), person_id).await?;
 
     let private_messages =
-      PrivateMessageView::get_unread_messages(context.pool(), person_id).await?;
+      PrivateMessageView::get_unread_messages(&mut context.pool(), person_id).await?;
 
-    let res = Self::Response {
+    Ok(Self::Response {
       replies,
       mentions,
       private_messages,
-    };
-
-    Ok(res)
+    })
   }
 }