Skip to content

Commit

Permalink
Add support for filtering mod logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@makotech222
makotech222 committed Aug 7, 2022
1 parent 04e25af commit fae3991
Show file tree
Hide file tree
Showing 25 changed files with 552 additions and 120 deletions.
294 changes: 252 additions & 42 deletions crates/api/src/site/mod_log.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,18 @@ use crate::Perform;
use actix_web::web::Data;
use lemmy_api_common::{
site::{GetModlog, GetModlogResponse},
utils::{blocking, check_private_instance, get_local_user_view_from_jwt_opt},
utils::{
blocking,
check_private_instance,
get_local_user_view_from_jwt_opt,
is_admin,
is_mod_or_admin,
},
};
use lemmy_db_schema::{
newtypes::{CommunityId, PersonId},
source::site::Site,
ModlogActionType,
};
use lemmy_db_views_moderator::structs::{
AdminPurgeCommentView,
Expand Down Expand Up @@ -42,69 +53,268 @@ impl Perform for GetModlog {

check_private_instance(&local_user_view, context.pool()).await?;

let type_ = data.type_.unwrap_or(ModlogActionType::All);
let community_id = data.community_id;
let mod_person_id = data.mod_person_id;

let site = blocking(context.pool(), Site::read_local_site).await??;
let (local_person_id, is_admin) = match local_user_view {
Some(s) => (s.person.id, is_admin(&s).is_ok()),
None => (PersonId(-1), false),
};
let community_id_value = match community_id {
Some(s) => s,
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)
.await
.is_ok();
let hide_modlog_names = site.hide_modlog_mod_names && !is_mod_of_community && !is_admin;

let mod_person_id = if hide_modlog_names {
None
} else {
data.mod_person_id
};
let other_person_id = data.other_person_id;
let page = data.page;
let limit = data.limit;
let removed_posts = blocking(context.pool(), move |conn| {
ModRemovePostView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let removed_posts = match type_ {
ModlogActionType::All | ModlogActionType::ModRemovePost => {
blocking(context.pool(), move |conn| {
ModRemovePostView::list(
conn,
community_id,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
}
_ => Default::default(),
};

let locked_posts = blocking(context.pool(), move |conn| {
ModLockPostView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let locked_posts = match type_ {
ModlogActionType::All | ModlogActionType::ModLockPost => {
blocking(context.pool(), move |conn| {
ModLockPostView::list(
conn,
community_id,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
}
_ => Default::default(),
};

let stickied_posts = blocking(context.pool(), move |conn| {
ModStickyPostView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let stickied_posts = match type_ {
ModlogActionType::All | ModlogActionType::ModStickyPost => {
blocking(context.pool(), move |conn| {
ModStickyPostView::list(
conn,
community_id,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
}
_ => Default::default(),
};

let removed_comments = blocking(context.pool(), move |conn| {
ModRemoveCommentView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let removed_comments = match type_ {
ModlogActionType::All | ModlogActionType::ModRemoveComment => {
blocking(context.pool(), move |conn| {
ModRemoveCommentView::list(
conn,
community_id,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
}
_ => Default::default(),
};

let banned_from_community = blocking(context.pool(), move |conn| {
ModBanFromCommunityView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let banned_from_community = match type_ {
ModlogActionType::All | ModlogActionType::ModBanFromCommunity => {
blocking(context.pool(), move |conn| {
ModBanFromCommunityView::list(
conn,
community_id,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
}
_ => Default::default(),
};

let added_to_community = blocking(context.pool(), move |conn| {
ModAddCommunityView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let added_to_community = match type_ {
ModlogActionType::All | ModlogActionType::ModAddCommunity => {
blocking(context.pool(), move |conn| {
ModAddCommunityView::list(
conn,
community_id,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
}
_ => Default::default(),
};

let transferred_to_community = blocking(context.pool(), move |conn| {
ModTransferCommunityView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let transferred_to_community = match type_ {
ModlogActionType::All | ModlogActionType::ModTransferCommunity => {
blocking(context.pool(), move |conn| {
ModTransferCommunityView::list(
conn,
community_id,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
}
_ => Default::default(),
};

let hidden_communities = blocking(context.pool(), move |conn| {
ModHideCommunityView::list(conn, community_id, mod_person_id, page, limit)
})
.await??;
let hidden_communities = match type_ {
ModlogActionType::All | ModlogActionType::ModHideCommunity => {
if other_person_id.is_none() {
blocking(context.pool(), move |conn| {
ModHideCommunityView::list(
conn,
community_id,
mod_person_id,
page,
limit,
hide_modlog_names,
)
})
.await??
} else {
Default::default()
}
}
_ => Default::default(),
};

// These arrays are only for the full modlog, when a community isn't given
let (
removed_communities,
banned,
added,
removed_communities,
admin_purged_persons,
admin_purged_communities,
admin_purged_posts,
admin_purged_comments,
) = if data.community_id.is_none() {
blocking(context.pool(), move |conn| {
Ok((
ModRemoveCommunityView::list(conn, mod_person_id, page, limit)?,
ModBanView::list(conn, mod_person_id, page, limit)?,
ModAddView::list(conn, mod_person_id, page, limit)?,
AdminPurgePersonView::list(conn, mod_person_id, page, limit)?,
AdminPurgeCommunityView::list(conn, mod_person_id, page, limit)?,
AdminPurgePostView::list(conn, mod_person_id, page, limit)?,
AdminPurgeCommentView::list(conn, mod_person_id, page, limit)?,
match type_ {
ModlogActionType::All | ModlogActionType::ModBan => ModBanView::list(
conn,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)?,
_ => Default::default(),
},
match type_ {
ModlogActionType::All | ModlogActionType::ModAdd => ModAddView::list(
conn,
mod_person_id,
other_person_id,
page,
limit,
hide_modlog_names,
)?,
_ => Default::default(),
},
match type_ {
ModlogActionType::All | ModlogActionType::ModRemoveCommunity => {
if other_person_id.is_none() {
ModRemoveCommunityView::list(conn, mod_person_id, page, limit, hide_modlog_names)?
} else {
Default::default()
}
}

_ => Default::default(),
},
match type_ {
ModlogActionType::All | ModlogActionType::AdminPurgePerson => {
if other_person_id.is_none() {
AdminPurgePersonView::list(conn, mod_person_id, page, limit, hide_modlog_names)?
} else {
Default::default()
}
}

_ => Default::default(),
},
match type_ {
ModlogActionType::All | ModlogActionType::AdminPurgeCommunity => {
if other_person_id.is_none() {
AdminPurgeCommunityView::list(conn, mod_person_id, page, limit, hide_modlog_names)?
} else {
Default::default()
}
}

_ => Default::default(),
},
match type_ {
ModlogActionType::All | ModlogActionType::AdminPurgePost => {
if other_person_id.is_none() {
AdminPurgePostView::list(conn, mod_person_id, page, limit, hide_modlog_names)?
} else {
Default::default()
}
}

_ => Default::default(),
},
match type_ {
ModlogActionType::All | ModlogActionType::AdminPurgeComment => {
if other_person_id.is_none() {
AdminPurgeCommentView::list(conn, mod_person_id, page, limit, hide_modlog_names)?
} else {
Default::default()
}
}

_ => Default::default(),
},
)) as Result<_, LemmyError>
})
.await??
Expand Down
5 changes: 5 additions & 0 deletions crates/api_common/src/site.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use crate::sensitive::Sensitive;
use lemmy_db_schema::{
newtypes::{CommentId, CommunityId, PersonId, PostId},
ListingType,
ModlogActionType,
SearchType,
SortType,
};
Expand Down Expand Up @@ -83,6 +84,8 @@ pub struct GetModlog {
pub page: Option<i64>,
pub limit: Option<i64>,
pub auth: Option<Sensitive<String>>,
pub type_: Option<ModlogActionType>,
pub other_person_id: Option<PersonId>,
}

#[derive(Debug, Serialize, Deserialize, Clone)]
Expand Down Expand Up @@ -122,6 +125,7 @@ pub struct CreateSite {
pub default_theme: Option<String>,
pub default_post_listing_type: Option<String>,
pub auth: Sensitive<String>,
pub hide_modlog_mod_names: Option<bool>,
}

#[derive(Debug, Serialize, Deserialize, Clone, Default)]
Expand All @@ -143,6 +147,7 @@ pub struct EditSite {
pub default_post_listing_type: Option<String>,
pub legal_information: Option<String>,
pub auth: Sensitive<String>,
pub hide_modlog_mod_names: Option<bool>,
}

#[derive(Debug, Serialize, Deserialize, Clone, Default)]
Expand Down
1 change: 1 addition & 0 deletions crates/api_crud/src/site/create.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ impl PerformCrud for CreateSite {
public_key: Some(keypair.public_key),
default_theme: data.default_theme.clone(),
default_post_listing_type: data.default_post_listing_type.clone(),
hide_modlog_mod_names: data.hide_modlog_mod_names,
..SiteForm::default()
};

Expand Down
1 change: 1 addition & 0 deletions crates/api_crud/src/site/update.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ impl PerformCrud for EditSite {
default_theme: data.default_theme.clone(),
default_post_listing_type: data.default_post_listing_type.clone(),
legal_information: data.legal_information.clone(),
hide_modlog_mod_names: data.hide_modlog_mod_names,
..SiteForm::default()
};

Expand Down
Loading

0 comments on commit fae3991

Please sign in to comment.