use lemmy_api_common::{
context::LemmyContext,
private_message::{PrivateMessageReportResponse, ResolvePrivateMessageReport},
- utils::{get_local_user_view_from_jwt, is_admin},
- websocket::{messages::SendModRoomMessage, UserOperation},
-};
-use lemmy_db_schema::{
- newtypes::CommunityId,
- source::private_message_report::PrivateMessageReport,
- traits::Reportable,
+ utils::{is_admin, local_user_view_from_jwt},
};
+use lemmy_db_schema::{source::private_message_report::PrivateMessageReport, traits::Reportable};
use lemmy_db_views::structs::PrivateMessageReportView;
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
#[async_trait::async_trait(?Send)]
impl Perform for ResolvePrivateMessageReport {
type Response = PrivateMessageReportResponse;
- #[tracing::instrument(skip(context, websocket_id))]
- async fn perform(
- &self,
- context: &Data<LemmyContext>,
- websocket_id: Option<ConnectionId>,
- ) -> Result<Self::Response, LemmyError> {
- let local_user_view =
- get_local_user_view_from_jwt(&self.auth, context.pool(), context.secret()).await?;
+ #[tracing::instrument(skip(context))]
+ async fn perform(&self, context: &Data<LemmyContext>) -> Result<Self::Response, LemmyError> {
+ let local_user_view = local_user_view_from_jwt(&self.auth, context).await?;
is_admin(&local_user_view)?;
let report_id = self.report_id;
let person_id = local_user_view.person.id;
if self.resolved {
- PrivateMessageReport::resolve(context.pool(), report_id, person_id)
+ PrivateMessageReport::resolve(&mut context.pool(), report_id, person_id)
.await
- .map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
+ .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
} else {
- PrivateMessageReport::unresolve(context.pool(), report_id, person_id)
+ PrivateMessageReport::unresolve(&mut context.pool(), report_id, person_id)
.await
- .map_err(|e| LemmyError::from_error_message(e, "couldnt_resolve_report"))?;
+ .with_lemmy_type(LemmyErrorType::CouldntResolveReport)?;
}
let private_message_report_view =
- PrivateMessageReportView::read(context.pool(), report_id).await?;
+ PrivateMessageReportView::read(&mut context.pool(), report_id).await?;
- let res = PrivateMessageReportResponse {
+ Ok(PrivateMessageReportResponse {
private_message_report_view,
- };
-
- context.chat_server().do_send(SendModRoomMessage {
- op: UserOperation::ResolvePrivateMessageReport,
- response: res.clone(),
- community_id: CommunityId(0),
- websocket_id,
- });
-
- Ok(res)
+ })
}
}