Infra-Mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-10-01 01:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Community modlog doesn't show non-community actions.

Browse Source 
Fixes #65
This commit is contained in:
Dessalines 2019-04-17 08:50:44 -07:00
parent 57e274c87a
commit f17b181ea9
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/actions/post_view.rs
View File

@ -116,6 +116,9 @@ impl PostView {
.order_by(score.desc()) .order_by(score.desc())
}; };
// TODO make sure community removed isn't fetched either
query = query.filter(removed.eq(false)); query = query.filter(removed.eq(false));
query.load::<Self>(conn) query.load::<Self>(conn)

14
server/src/websocket_server/server.rs
View File

@ -1792,11 +1792,19 @@ impl Perform for GetModlog {
let removed_posts = ModRemovePostView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap(); let removed_posts = ModRemovePostView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap();
let locked_posts = ModLockPostView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap(); let locked_posts = ModLockPostView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap();
let removed_comments = ModRemoveCommentView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap(); let removed_comments = ModRemoveCommentView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap();
let removed_communities = ModRemoveCommunityView::list(&conn, self.mod_user_id, self.limit, self.page).unwrap();
let banned_from_community = ModBanFromCommunityView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap(); let banned_from_community = ModBanFromCommunityView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap();
let banned = ModBanView::list(&conn, self.mod_user_id, self.limit, self.page).unwrap();
let added_to_community = ModAddCommunityView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap(); let added_to_community = ModAddCommunityView::list(&conn, self.community_id, self.mod_user_id, self.limit, self.page).unwrap();
let added = ModAddView::list(&conn, self.mod_user_id, self.limit, self.page).unwrap();
// These arrays are only for the full modlog, when a community isn't given
let mut removed_communities = Vec::new();
let mut banned = Vec::new();
let mut added = Vec::new();
if self.community_id.is_none() {
removed_communities = ModRemoveCommunityView::list(&conn, self.mod_user_id, self.limit, self.page).unwrap();
banned = ModBanView::list(&conn, self.mod_user_id, self.limit, self.page).unwrap();
added = ModAddView::list(&conn, self.mod_user_id, self.limit, self.page).unwrap();
}
// Return the jwt // Return the jwt
serde_json::to_string( serde_json::to_string(