use crate::Perform;
use actix_web::web::Data;
use lemmy_api_common::{
+ context::LemmyContext,
site::{GetModlog, GetModlogResponse},
- utils::{
- blocking,
- check_private_instance,
- get_local_user_view_from_jwt_opt,
- is_admin,
- is_mod_or_admin,
- },
+ utils::{check_private_instance, is_admin, is_mod_or_admin, local_user_view_from_jwt_opt},
};
use lemmy_db_schema::{
newtypes::{CommunityId, PersonId},
ModAddView,
ModBanFromCommunityView,
ModBanView,
+ ModFeaturePostView,
ModHideCommunityView,
ModLockPostView,
ModRemoveCommentView,
ModRemoveCommunityView,
ModRemovePostView,
- ModStickyPostView,
ModTransferCommunityView,
ModlogListParams,
};
-use lemmy_utils::{error::LemmyError, ConnectionId};
-use lemmy_websocket::LemmyContext;
+use lemmy_utils::error::LemmyError;
use ModlogActionType::*;
#[async_trait::async_trait(?Send)]
impl Perform for GetModlog {
type Response = GetModlogResponse;
- #[tracing::instrument(skip(context, _websocket_id))]
- async fn perform(
- &self,
- context: &Data<LemmyContext>,
- _websocket_id: Option<ConnectionId>,
- ) -> Result<GetModlogResponse, LemmyError> {
+ #[tracing::instrument(skip(context))]
+ async fn perform(&self, context: &Data<LemmyContext>) -> Result<GetModlogResponse, LemmyError> {
let data: &GetModlog = self;
- let local_user_view =
- get_local_user_view_from_jwt_opt(data.auth.as_ref(), context.pool(), context.secret())
- .await?;
- let local_site = blocking(context.pool(), LocalSite::read).await??;
+ let local_user_view = local_user_view_from_jwt_opt(data.auth.as_ref(), context).await;
+ let local_site = LocalSite::read(&mut context.pool()).await?;
check_private_instance(&local_user_view, &local_site)?;
None => CommunityId(-1),
};
let is_mod_of_community = data.community_id.is_some()
- && is_mod_or_admin(context.pool(), local_person_id, community_id_value)
+ && is_mod_or_admin(&mut context.pool(), local_person_id, community_id_value)
.await
.is_ok();
let hide_modlog_names = local_site.hide_modlog_mod_names && !is_mod_of_community && !is_admin;
hide_modlog_names,
};
let removed_posts = match type_ {
- All | ModRemovePost => {
- blocking(context.pool(), move |conn| {
- ModRemovePostView::list(conn, params)
- })
- .await??
- }
+ All | ModRemovePost => ModRemovePostView::list(&mut context.pool(), params).await?,
_ => Default::default(),
};
let locked_posts = match type_ {
- All | ModLockPost => {
- blocking(context.pool(), move |conn| {
- ModLockPostView::list(conn, params)
- })
- .await??
- }
+ All | ModLockPost => ModLockPostView::list(&mut context.pool(), params).await?,
_ => Default::default(),
};
- let stickied_posts = match type_ {
- All | ModStickyPost => {
- blocking(context.pool(), move |conn| {
- ModStickyPostView::list(conn, params)
- })
- .await??
- }
+ let featured_posts = match type_ {
+ All | ModFeaturePost => ModFeaturePostView::list(&mut context.pool(), params).await?,
_ => Default::default(),
};
let removed_comments = match type_ {
- All | ModRemoveComment => {
- blocking(context.pool(), move |conn| {
- ModRemoveCommentView::list(conn, params)
- })
- .await??
- }
+ All | ModRemoveComment => ModRemoveCommentView::list(&mut context.pool(), params).await?,
_ => Default::default(),
};
let banned_from_community = match type_ {
All | ModBanFromCommunity => {
- blocking(context.pool(), move |conn| {
- ModBanFromCommunityView::list(conn, params)
- })
- .await??
+ ModBanFromCommunityView::list(&mut context.pool(), params).await?
}
_ => Default::default(),
};
let added_to_community = match type_ {
- All | ModAddCommunity => {
- blocking(context.pool(), move |conn| {
- ModAddCommunityView::list(conn, params)
- })
- .await??
- }
+ All | ModAddCommunity => ModAddCommunityView::list(&mut context.pool(), params).await?,
_ => Default::default(),
};
let transferred_to_community = match type_ {
All | ModTransferCommunity => {
- blocking(context.pool(), move |conn| {
- ModTransferCommunityView::list(conn, params)
- })
- .await??
+ ModTransferCommunityView::list(&mut context.pool(), params).await?
}
_ => Default::default(),
};
let hidden_communities = match type_ {
All | ModHideCommunity if other_person_id.is_none() => {
- blocking(context.pool(), move |conn| {
- ModHideCommunityView::list(conn, params)
- })
- .await??
+ ModHideCommunityView::list(&mut context.pool(), params).await?
}
_ => Default::default(),
};
admin_purged_posts,
admin_purged_comments,
) = if data.community_id.is_none() {
- blocking(context.pool(), move |conn| {
- Ok((
- match type_ {
- All | ModBan => ModBanView::list(conn, params)?,
- _ => Default::default(),
- },
- match type_ {
- All | ModAdd => ModAddView::list(conn, params)?,
- _ => Default::default(),
- },
- match type_ {
- All | ModRemoveCommunity if other_person_id.is_none() => {
- ModRemoveCommunityView::list(conn, params)?
- }
- _ => Default::default(),
- },
- match type_ {
- All | AdminPurgePerson if other_person_id.is_none() => {
- AdminPurgePersonView::list(conn, params)?
- }
- _ => Default::default(),
- },
- match type_ {
- All | AdminPurgeCommunity if other_person_id.is_none() => {
- AdminPurgeCommunityView::list(conn, params)?
- }
- _ => Default::default(),
- },
- match type_ {
- All | AdminPurgePost if other_person_id.is_none() => {
- AdminPurgePostView::list(conn, params)?
- }
- _ => Default::default(),
- },
- match type_ {
- All | AdminPurgeComment if other_person_id.is_none() => {
- AdminPurgeCommentView::list(conn, params)?
- }
- _ => Default::default(),
- },
- )) as Result<_, LemmyError>
- })
- .await??
+ (
+ match type_ {
+ All | ModBan => ModBanView::list(&mut context.pool(), params).await?,
+ _ => Default::default(),
+ },
+ match type_ {
+ All | ModAdd => ModAddView::list(&mut context.pool(), params).await?,
+ _ => Default::default(),
+ },
+ match type_ {
+ All | ModRemoveCommunity if other_person_id.is_none() => {
+ ModRemoveCommunityView::list(&mut context.pool(), params).await?
+ }
+ _ => Default::default(),
+ },
+ match type_ {
+ All | AdminPurgePerson if other_person_id.is_none() => {
+ AdminPurgePersonView::list(&mut context.pool(), params).await?
+ }
+ _ => Default::default(),
+ },
+ match type_ {
+ All | AdminPurgeCommunity if other_person_id.is_none() => {
+ AdminPurgeCommunityView::list(&mut context.pool(), params).await?
+ }
+ _ => Default::default(),
+ },
+ match type_ {
+ All | AdminPurgePost if other_person_id.is_none() => {
+ AdminPurgePostView::list(&mut context.pool(), params).await?
+ }
+ _ => Default::default(),
+ },
+ match type_ {
+ All | AdminPurgeComment if other_person_id.is_none() => {
+ AdminPurgeCommentView::list(&mut context.pool(), params).await?
+ }
+ _ => Default::default(),
+ },
+ )
} else {
Default::default()
};
Ok(GetModlogResponse {
removed_posts,
locked_posts,
- stickied_posts,
+ featured_posts,
removed_comments,
removed_communities,
banned_from_community,
projects / lemmy.git / blobdiff