Add Modlog Filters #2313

makotech222 · 2022-06-13T02:47:51Z

Addresses issue: LemmyNet/lemmy-ui#555

In summary, this PR does the following:

(minor) fixes running on windows build
Adds three new filter inputs to the Modlog: Action, Mod, and User
Adds new setting to Site: Hide modlog mod names (default true). Hides the mod names on the mod log page (front and backend)
Adds a generic dropdown component for general use (derived from the navbar user dropdown, could eventually be refactored to use new component)

Associated PRs:

Site:

dessalines

Check out the search perform impl, this should look very similar to that.

migrations/2022-06-12-012121_add_site_hide_modlog_names/up.sql

crates/api_common/src/site.rs

crates/api/src/site/mod_log.rs

crates/db_views_actor/src/person_view.rs

crates/db_views_moderator/src/mod_add_community_view.rs

Nutomic · 2022-06-17T13:11:22Z

About general Rust usage, cargo clippy should give you some hints. Also make sure that CI passes. You can look at .drone.yml for the exact commands it uses, so you can run them locally.

makotech222 · 2022-06-19T01:46:37Z

@dessalines Okay i'm in a pretty good state now. I have two questions before I convert back to PR: Is there an established way to get just admins+mods from the api? And also, Should mods be able to view modlog names like admins would?

I'm currently just getting all users for the 'filter by mod' feature, which isn't entirely correct, but works if you search and select a mod user. Also not sure if mods should be able to view another mods actions that may be in a different community.

Nutomic · 2022-06-21T11:30:45Z

What do you mean "get admins and mods from api"? If you want to check that a given person is a mod/admin, use is_mod_or_admin() function from crates/api_common/src/utils.rs. I think mods should be able to see names of other mods from the same community in the modlog, but not when the modlog item is in another community.

crates/api/src/site/mod_log.rs

crates/api_common/src/site.rs

crates/db_views_moderator/src/admin_purge_comment_view.rs

crates/db_views_moderator/src/mod_add_community_view.rs

crates/db_views_moderator/src/structs.rs

dessalines

Its looking pretty close! I'll take a look at the front end ones now. lmk when you're ready for me to test these.

crates/db_views_moderator/src/mod_sticky_post_view.rs

crates/db_views_moderator/src/mod_remove_comment_view.rs

crates/db_views_moderator/src/admin_purge_post_view.rs

crates/db_views_moderator/src/admin_purge_person_view.rs

crates/db_views_moderator/src/admin_purge_community_view.rs

crates/api/src/site/mod_log.rs

makotech222 · 2022-07-26T02:57:04Z

Okay give this all another look.

dessalines

We try to review these as quickly as we can, so I apologize if I'm slow there, but it was 14 days since your last update.

crates/api/src/site/mod_log.rs

makotech222 · 2022-07-27T13:46:49Z

Okay resolved those issues

crates/api/src/site/mod_log.rs

dessalines · 2022-07-27T23:03:41Z

crates/api/src/site/mod_log.rs

+    let is_admin = is_admin(local_user_view.as_ref().expect("")).is_ok();
+    let local_person_id = match local_user_view {
+      Some(s) => s.person.id,
+      None => PersonId(-1),


Why are you setting these to -1? They should be left as options so you can catch the None case. Also this is a better syntax:

let local_person_id = local_user_view.map(|l| l.person.id);

It is only used to clean up the syntax around calling 'is_mod_or_admin' which requires a PersonId.

crates/api/src/site/mod_log.rs

dessalines

Looks good, but I'll have @Nutomic take a look too.

crates/api/src/site/mod_log.rs

crates/db_views_moderator/src/structs.rs

crates/api/src/site/mod_log.rs

Nutomic · 2022-07-28T16:53:52Z

Other than my last comment it looks good to me. Once that is changed we can merge.

crates/api/src/site/mod_log.rs

dessalines · 2022-08-04T19:42:57Z

@makotech222 Have you had time to look at these? The merge conflicts will start to pile up the longer this waits here.

makotech222 · 2022-08-04T20:27:01Z

Yep on my things to do list for this weekend

makotech222 · 2022-08-07T15:33:01Z

Okay should be good now

dessalines

Nutomic should be able to take a look when they get back from vacay.

Nutomic · 2022-08-16T11:52:15Z

Thank you for the contribution :)

makotech222 requested review from Nutomic and dessalines as code owners June 13, 2022 02:47

This was referenced Jun 13, 2022

Add Modlog Filters LemmyNet/lemmy-ui#682

Merged

Add Modlog Filters LemmyNet/lemmy-js-client#65

Merged

Add Modlog Filters LemmyNet/lemmy-translations#27

Merged

dessalines requested changes Jun 13, 2022

View reviewed changes

Nutomic reviewed Jun 17, 2022

View reviewed changes

crates/db_views_moderator/src/mod_add_community_view.rs Outdated Show resolved Hide resolved

makotech222 marked this pull request as draft June 17, 2022 19:01

makotech222 force-pushed the modlog-filters branch 4 times, most recently from 61b4ac5 to 7d1a93e Compare June 19, 2022 00:16

dessalines reviewed Jun 21, 2022

View reviewed changes

Nutomic mentioned this pull request Jul 5, 2022

Merge moderation database tables #2349

Closed

makotech222 force-pushed the modlog-filters branch 2 times, most recently from 8a202ef to 369d42a Compare July 12, 2022 01:48

dessalines reviewed Jul 12, 2022

View reviewed changes

makotech222 force-pushed the modlog-filters branch from 96da4bb to d382ddd Compare July 26, 2022 01:45

makotech222 marked this pull request as ready for review July 26, 2022 02:56

dessalines reviewed Jul 26, 2022

View reviewed changes

crates/api/src/site/mod_log.rs Outdated Show resolved Hide resolved

crates/api/src/site/mod_log.rs Outdated Show resolved Hide resolved

crates/api/src/site/mod_log.rs Outdated Show resolved Hide resolved

dessalines reviewed Jul 27, 2022

View reviewed changes

dessalines approved these changes Jul 28, 2022

View reviewed changes

crates/api/src/site/mod_log.rs Show resolved Hide resolved

Nutomic reviewed Jul 28, 2022

View reviewed changes

crates/db_views_moderator/src/structs.rs Show resolved Hide resolved

Nutomic reviewed Jul 28, 2022

View reviewed changes

crates/api/src/site/mod_log.rs Outdated Show resolved Hide resolved

Nutomic reviewed Jul 28, 2022

View reviewed changes

crates/api/src/site/mod_log.rs Show resolved Hide resolved

Nutomic requested changes Jul 28, 2022

View reviewed changes

crates/api/src/site/mod_log.rs Outdated Show resolved Hide resolved

Nutomic reviewed Jul 28, 2022

View reviewed changes

crates/api/src/site/mod_log.rs Outdated Show resolved Hide resolved

makotech222 force-pushed the modlog-filters branch from 9d8c213 to fae3991 Compare August 7, 2022 13:44

makotech222 added 2 commits August 7, 2022 08:44

Fix crash running locally on windows.

317d4fa

Add support for filtering mod logs

47a1ad1

makotech222 force-pushed the modlog-filters branch from fae3991 to 47a1ad1 Compare August 7, 2022 13:45

makotech222 added 2 commits August 7, 2022 10:20

Refactor cleanup

cee9e9c

Clippy fix

5478927

makotech222 added 2 commits August 7, 2022 10:38

Condense match statements

d1a3f6f

Clippy fix 2

78679da

dessalines approved these changes Aug 8, 2022

View reviewed changes

Nutomic approved these changes Aug 16, 2022

View reviewed changes

Nutomic enabled auto-merge (squash) August 16, 2022 11:50

Nutomic disabled auto-merge August 16, 2022 11:51

Nutomic merged commit 21455d6 into LemmyNet:main Aug 16, 2022

Nutomic mentioned this pull request Jan 20, 2023

Hide names of mods/admins in mod log #1601

Closed

makotech222 deleted the modlog-filters branch February 25, 2023 15:21

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Modlog Filters #2313

Add Modlog Filters #2313

makotech222 commented Jun 13, 2022 •

edited

Loading

dessalines left a comment

Nutomic commented Jun 17, 2022

makotech222 commented Jun 19, 2022 •

edited

Loading

Nutomic commented Jun 21, 2022

dessalines left a comment

makotech222 commented Jul 26, 2022

dessalines left a comment

makotech222 commented Jul 27, 2022

dessalines Jul 27, 2022

makotech222 Jul 28, 2022

dessalines left a comment

Nutomic commented Jul 28, 2022

dessalines commented Aug 4, 2022

makotech222 commented Aug 4, 2022

makotech222 commented Aug 7, 2022

dessalines left a comment

Nutomic commented Aug 16, 2022

Add Modlog Filters #2313

Add Modlog Filters #2313

Conversation

makotech222 commented Jun 13, 2022 • edited Loading

dessalines left a comment

Choose a reason for hiding this comment

Nutomic commented Jun 17, 2022

makotech222 commented Jun 19, 2022 • edited Loading

Nutomic commented Jun 21, 2022

dessalines left a comment

Choose a reason for hiding this comment

makotech222 commented Jul 26, 2022

dessalines left a comment

Choose a reason for hiding this comment

makotech222 commented Jul 27, 2022

dessalines Jul 27, 2022

Choose a reason for hiding this comment

makotech222 Jul 28, 2022

Choose a reason for hiding this comment

dessalines left a comment

Choose a reason for hiding this comment

Nutomic commented Jul 28, 2022

dessalines commented Aug 4, 2022

makotech222 commented Aug 4, 2022

makotech222 commented Aug 7, 2022

dessalines left a comment

Choose a reason for hiding this comment

Nutomic commented Aug 16, 2022

makotech222 commented Jun 13, 2022 •

edited

Loading

makotech222 commented Jun 19, 2022 •

edited

Loading