chore: added search to mod log

Author: Golbolco

react_main/src/components/ReportDetail.jsx

@@ -28,6 +28,7 @@ import { NameWithAvatar } from "pages/User/User";
 import { UserContext, SiteInfoContext } from "../Contexts";
 import ReportTypology from "./ReportTypology";
 import { useViolations } from "../hooks/useViolations";
+import RapSheet from "./RapSheet";
 
 export default function ReportDetail({
   report: initialReport,
@@ -258,6 +259,7 @@ export default function ReportDetail({
                   avatar={report.reportedUserAvatar}
                 />
               </Box>
+              <RapSheet userId={report.reportedUserId} />
               {report.gameId && (
                 <Box>
                   <Typography variant="caption" color="textSecondary">

react_main/src/pages/Policy/Moderation/ModActions.jsx

@@ -1,6 +1,12 @@
 import React, { useState, useEffect } from "react";
 import axios from "axios";
-import { Box, Stack, Typography } from "@mui/material";
+import {
+  Autocomplete,
+  Box,
+  Stack,
+  TextField,
+  Typography,
+} from "@mui/material";
 
 import { useErrorAlert } from "components/Alerts";
 import { getPageNavFilterArg, PageNav } from "components/Nav";
@@ -12,21 +18,63 @@ import { COMMAND_COLOR, useModCommands } from "./commands";
 export function ModActions(props) {
   const [page, setPage] = useState(1);
   const [actions, setActions] = useState([]);
+  const [staffNameFilter, setStaffNameFilter] = useState("");
+  const [actionTypeFilter, setActionTypeFilter] = useState("");
 
   const modCommands = useModCommands({}, () => {}, props.setResults);
   const errorAlert = useErrorAlert();
 
+  const actionTypeOptions = Object.keys(modCommands).sort();
+
   useEffect(() => {
-    onPageNav(1);
-  }, []);
+    loadActions(1);
+  }, [staffNameFilter, actionTypeFilter]);
+
+  function loadActions(_page) {
+    const params = new URLSearchParams();
+
+    if (_page > 1 && actions.length > 0) {
+      params.append("last", actions[actions.length - 1].date);
+    }
+
+    if (staffNameFilter) {
+      params.append("staffName", staffNameFilter);
+    }
+    if (actionTypeFilter) {
+      params.append("actionType", actionTypeFilter);
+    }
+
+    axios
+      .get(`/api/mod/actions?${params.toString()}`)
+      .then((res) => {
+        if (res.data.length > 0 || _page === 1) {
+          setActions(res.data);
+          setPage(_page);
+        }
+      })
+      .catch(errorAlert);
+  }
 
   function onPageNav(_page) {
-    var filterArg = getPageNavFilterArg(_page, page, actions, "date");
+    if (_page === page) return;
+
+    const params = new URLSearchParams();
 
-    if (filterArg == null) return;
+    if (_page > page && actions.length > 0) {
+      params.append("last", actions[actions.length - 1].date);
+    } else if (_page < page && actions.length > 0) {
+      params.append("first", actions[0].date);
+    }
+
+    if (staffNameFilter) {
+      params.append("staffName", staffNameFilter);
+    }
+    if (actionTypeFilter) {
+      params.append("actionType", actionTypeFilter);
+    }
 
     axios
-      .get(`/api/mod/actions?${filterArg}`)
+      .get(`/api/mod/actions?${params.toString()}`)
       .then((res) => {
         if (res.data.length > 0) {
           setActions(res.data);
@@ -111,9 +159,50 @@ export function ModActions(props) {
   return (
     <div className="box-panel">
       <Typography variant="h3">Mod Actions</Typography>
-      <Stack direction="column" spacing={1}>
+      <Stack direction="column" spacing={2}>
+        <Stack
+          direction={{ xs: "column", sm: "row" }}
+          spacing={2}
+          sx={{ mb: 1 }}
+        >
+          <TextField
+            label="Search by Staff Name"
+            variant="outlined"
+            size="small"
+            value={staffNameFilter}
+            onChange={(e) => {
+              setStaffNameFilter(e.target.value);
+              setPage(1);
+            }}
+            sx={{ minWidth: 200 }}
+          />
+          <Autocomplete
+            options={actionTypeOptions}
+            value={actionTypeFilter || null}
+            onChange={(e, newValue) => {
+              setActionTypeFilter(newValue || "");
+              setPage(1);
+            }}
+            renderInput={(params) => (
+              <TextField
+                {...params}
+                label="Filter by Action Type"
+                variant="outlined"
+                size="small"
+              />
+            )}
+            sx={{ minWidth: 250 }}
+            clearOnEscape
+          />
+        </Stack>
         {pageNav}
-        {actionRows}
+        {actions.length === 0 ? (
+          <Typography variant="body2" color="textSecondary" sx={{ py: 2, textAlign: "center" }}>
+            No actions found.
+          </Typography>
+        ) : (
+          actionRows
+        )}
         {pageNav}
       </Stack>
     </div>

routes/mod.js

@@ -1019,60 +1019,6 @@ router.get("/flagged", async (req, res) => {
   }
 });
 
-router.get("/bans", async (req, res) => {
-  try {
-    var userId = await routeUtils.verifyLoggedIn(req);
-    var userIdToCheck = String(req.query.userId || "").trim();
-    var perm = "seeModPanel";
-
-    if (!(await routeUtils.verifyPermission(res, userId, perm))) return;
-
-    if (!userIdToCheck) {
-      res.status(400);
-      res.send("User ID required.");
-      return;
-    }
-
-    var user = await models.User.findOne({
-      id: userIdToCheck,
-    }).select("id");
-
-    if (!user) {
-      res.status(404);
-      res.send("User does not exist.");
-      return;
-    }
-
-    const activeBans = await models.Ban.find({
-      userId: userIdToCheck,
-      $or: [{ expires: 0 }, { expires: { $gt: Date.now() } }],
-    }).select("type expires");
-
-    const banTypeLabels = {
-      forum: "Forum",
-      chat: "Chat",
-      game: "Game",
-      playRanked: "Ranked",
-      playCompetitive: "Competitive",
-      site: "Site",
-      ipFlag: "IP Flag",
-      gameAuto: "Game (Auto)",
-    };
-
-    const formattedBans = activeBans.map((ban) => ({
-      type: banTypeLabels[ban.type] || ban.type,
-      expires: ban.expires,
-      permanent: ban.expires === 0,
-    }));
-
-    res.send(formattedBans);
-  } catch (e) {
-    logger.error(e);
-    res.status(500);
-    res.send("Error loading bans.");
-  }
-});
-
 router.post("/clearSetupName", async (req, res) => {
   res.setHeader("Content-Type", "application/json");
   try {
@@ -2289,10 +2235,31 @@ router.get("/actions", async function (req, res) {
   try {
     var last = Number(req.query.last);
     var first = Number(req.query.first);
+    var staffName = req.query.staffName ? String(req.query.staffName).trim() : "";
+    var actionType = req.query.actionType ? String(req.query.actionType).trim() : "";
+
+    var query = {};
+
+    if (actionType) {
+      query.name = actionType;
+    }
+
+    if (staffName) {
+      const staffUsers = await models.User.find({
+        name: { $regex: staffName, $options: "i" },
+      }).select("id");
+      const staffIds = staffUsers.map((u) => u.id);
+      if (staffIds.length > 0) {
+        query.modId = { $in: staffIds };
+      } else {
+        res.send([]);
+        return;
+      }
+    }
 
     var actions = await routeUtils.modelPageQuery(
       models.ModAction,
-      {},
+      query,
       "date",
       last,
       first,