comment::{CommentReportResponse, ResolveCommentReport},
context::LemmyContext,
utils::{is_mod_or_admin, local_user_view_from_jwt},
- websocket::UserOperation,
};
use lemmy_db_schema::{source::comment_report::CommentReport, traits::Reportable};
use lemmy_db_views::structs::CommentReportView;
-use lemmy_utils::{error::LemmyError, ConnectionId};
+use lemmy_utils::error::{LemmyError, LemmyErrorExt, LemmyErrorType};
/// Resolves or unresolves a comment report and notifies the moderators of the community
#[async_trait::async_trait(?Send)]
impl Perform for ResolveCommentReport {
type Response = CommentReportResponse;
- #[tracing::instrument(skip(context, websocket_id))]
+ #[tracing::instrument(skip(context))]
async fn perform(
&self,
context: &Data<LemmyContext>,
- websocket_id: Option<ConnectionId>,
) -> Result<CommentReportResponse, LemmyError> {
let data: &ResolveCommentReport = self;
let local_user_view = local_user_view_from_jwt(&data.auth, context).await?;
let report_id = data.report_id;
let person_id = local_user_view.person.id;
- let report = CommentReportView::read(context.pool(), report_id, person_id).await?;
+ let report = CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
let person_id = local_user_view.person.id;
- is_mod_or_admin(context.pool(), person_id, report.community.id).await?;
+ is_mod_or_admin(&mut context.pool(), person_id, report.community.id).await?;
if data.resolved {
- CommentReport::resolve(context.pool(), report_id, person_id)
+ CommentReport::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 {
- CommentReport::unresolve(context.pool(), report_id, person_id)
+ CommentReport::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 report_id = data.report_id;
- let comment_report_view = CommentReportView::read(context.pool(), report_id, person_id).await?;
+ let comment_report_view =
+ CommentReportView::read(&mut context.pool(), report_id, person_id).await?;
- let res = CommentReportResponse {
+ Ok(CommentReportResponse {
comment_report_view,
- };
-
- context.send_mod_ws_message(
- &UserOperation::ResolveCommentReport,
- &res,
- report.community.id,
- websocket_id,
- )?;
-
- Ok(res)
+ })
}
}