Mod Pane: add audit log to more places

Nerimity · Jan 21, 2025 · 8baf167 · 8baf167
1 parent 9d06b2e
commit 8baf167
Show file tree

Hide file tree

Showing 4 changed files with 324 additions and 123 deletions.
diff --git a/src/chat-api/services/ModerationService.ts b/src/chat-api/services/ModerationService.ts
@@ -234,15 +234,20 @@ export interface AuditLog {
   reason?: string;
   expireAt?: number;
 }
-
-export const getAuditLog = async (limit: number, afterId?: string) => {
+interface getAuditLogOpts {
+  search?: string;
+  limit: number;
+  afterId?: string;
+}
+export const getAuditLog = async ({ limit, afterId, search }: getAuditLogOpts) => {
   const data = await request<AuditLog[]>({
     method: "GET",
     params: {
       ...(afterId ? { after: afterId } : undefined),
+      ...(search ? { q: search } : undefined),
       limit,
     },
-    url: env.SERVER_URL + "/api/moderation/audit-logs",
+    url: env.SERVER_URL + "/api/moderation/audit-logs" + (search ? "/search" : ""),
     useToken: true,
   });
   return data;

diff --git a/src/components/moderation-pane/ModerationPane.tsx b/src/components/moderation-pane/ModerationPane.tsx
@@ -5,6 +5,7 @@ import {
   createResource,
   createSignal,
   For,
+  JSX,
   lazy,
   on,
   onMount,
@@ -797,7 +798,10 @@ function StatsArea() {
   );
 }
 
-function AuditLogPane() {
+export function AuditLogPane(props: {
+  search: string;
+  style?: JSX.CSSProperties;
+}) {
   const LIMIT = 30;
   const [items, setItems] = createSignal<AuditLog[]>([]);
   const [afterId, setAfterId] = createSignal<string | undefined>(undefined);
@@ -807,7 +811,7 @@ function AuditLogPane() {
 
   createEffect(
     on(afterId, async () => {
-      fetchServers();
+      fetchLogs();
     })
   );
 
@@ -817,9 +821,13 @@ function AuditLogPane() {
   };
   const firstFive = () => items().slice(0, 5);
 
-  const fetchServers = () => {
+  const fetchLogs = () => {
     setLoadMoreClicked(true);
-    getAuditLog(LIMIT, afterId())
+    getAuditLog({
+      limit: LIMIT,
+      afterId: afterId(),
+      search: props.search,
+    })
       .then((newItems) => {
         setItems([...items(), ...newItems]);
         if (newItems.length >= LIMIT) setLoadMoreClicked(false);
@@ -831,7 +839,10 @@ function AuditLogPane() {
     <PaneContainer
       class="pane servers"
       expanded={showAll()}
-      style={!showAll() ? { height: "initial" } : undefined}
+      style={{
+        ...(!showAll() ? { height: "initial" } : undefined),
+        ...props.style,
+      }}
     >
       <FlexRow
         gap={5}

diff --git a/src/components/moderation-pane/ServerPage.tsx b/src/components/moderation-pane/ServerPage.tsx
@@ -4,7 +4,7 @@ import { createUpdatedSignal } from "@/common/createUpdatedSignal";
 import { useWindowProperties } from "@/common/useWindowProperties";
 import { useNavigate, useParams } from "solid-navigator";
 import { Show, createEffect, createSignal, onMount } from "solid-js";
-import { User } from "./ModerationPane";
+import { AuditLogPane, User } from "./ModerationPane";
 import Text from "../ui/Text";
 import SettingsBlock from "../ui/settings-block/SettingsBlock";
 import Input from "../ui/input/Input";
@@ -175,13 +175,15 @@ export default function ServerPage() {
           </div>
           <div style={{ "margin-bottom": "10px" }}>
             <UsersAuditLogsPane
-              title="Audit Logs"
+              title="Server Audit Logs"
               search={params.serverId}
               hideSearchBar
               noMargin
             />
           </div>
 
+          <AuditLogPane search={params.serverId} style={{ margin: 0 }} />
+
           <Show when={Object.keys(updatedInputValues()).length}>
             <SettingsBlock
               label="Confirm Admin Password"