Implement reports for private messages (#2433)

[lemmy.git] / crates / api_crud / src / private_message / read.rs

diff --git a/crates/api_crud/src/private_message/read.rs b/crates/api_crud/src/private_message/read.rs
index 79bc85f45bd391078e97694aca6e68946b2f13ae..fbf7621c71266900f1fafc4d6e9a9e3cb1c11f1e 100644 (file)
--- a/crates/api_crud/src/private_message/read.rs
+++ b/crates/api_crud/src/private_message/read.rs
@@ -1,39 +1,55 @@
 use crate::PerformCrud;
 use actix_web::web::Data;
 use lemmy_api_common::{
-  blocking,
-  get_local_user_view_from_jwt,
-  person::{GetPrivateMessages, PrivateMessagesResponse},
+  private_message::{GetPrivateMessages, PrivateMessagesResponse},
+  utils::{blocking, get_local_user_view_from_jwt},
 };
-use lemmy_db_views::private_message_view::PrivateMessageQueryBuilder;
-use lemmy_utils::{ConnectionId, LemmyError};
+use lemmy_db_schema::traits::DeleteableOrRemoveable;
+use lemmy_db_views::private_message_view::PrivateMessageQuery;
+use lemmy_utils::{error::LemmyError, ConnectionId};
 use lemmy_websocket::LemmyContext;
 
 #[async_trait::async_trait(?Send)]
 impl PerformCrud for GetPrivateMessages {
   type Response = PrivateMessagesResponse;
 
+  #[tracing::instrument(skip(self, context, _websocket_id))]
   async fn perform(
     &self,
     context: &Data<LemmyContext>,
     _websocket_id: Option<ConnectionId>,
   ) -> Result<PrivateMessagesResponse, LemmyError> {
-    let data: &GetPrivateMessages = &self;
-    let local_user_view = get_local_user_view_from_jwt(&data.auth, context.pool()).await?;
+    let data: &GetPrivateMessages = self;
+    let local_user_view =
+      get_local_user_view_from_jwt(data.auth.as_ref(), context.pool(), context.secret()).await?;
     let person_id = local_user_view.person.id;
 
     let page = data.page;
     let limit = data.limit;
     let unread_only = data.unread_only;
-    let messages = blocking(context.pool(), move |conn| {
-      PrivateMessageQueryBuilder::create(&conn, person_id)
+    let mut messages = blocking(context.pool(), move |conn| {
+      PrivateMessageQuery::builder()
+        .conn(conn)
+        .recipient_id(person_id)
         .page(page)
         .limit(limit)
         .unread_only(unread_only)
+        .build()
         .list()
     })
     .await??;
 
+    // Blank out deleted or removed info
+    for pmv in messages
+      .iter_mut()
+      .filter(|pmv| pmv.private_message.deleted)
+    {
+      pmv.private_message = pmv
+        .to_owned()
+        .private_message
+        .blank_out_deleted_or_removed_info();
+    }
+
     Ok(PrivateMessagesResponse {
       private_messages: messages,
     })