Merge master

backend/src/plugins/ModActions/commands/CasesModCmd.ts

@@ -4,7 +4,6 @@ import { sendErrorMessage } from "../../../pluginUtils";
 import { UnknownUser, emptyEmbedValue, renderUsername, resolveMember, resolveUser, trimLines } from "../../../utils";
 import { asyncMap } from "../../../utils/async";
 import { createPaginatedMessage } from "../../../utils/createPaginatedMessage";
-import { getChunkedEmbedFields } from "../../../utils/getChunkedEmbedFields";
 import { getGuildPrefix } from "../../../utils/getGuildPrefix";
 import { CasesPlugin } from "../../Cases/CasesPlugin";
 import { modActionsCmd } from "../types";
@@ -13,7 +12,7 @@ const opts = {
   mod: ct.userId({ option: true }),
 };
 
-const casesPerPage = 5;
+const casesPerPage = 10;
 
 export const CasesModCmd = modActionsCmd({
   trigger: ["cases", "modlogs", "infractions"],
@@ -52,8 +51,9 @@ export const CasesModCmd = modActionsCmd({
         const cases = await casesPlugin.getRecentCasesByMod(modId, casesPerPage, (page - 1) * casesPerPage);
         const lines = await asyncMap(cases, (c) => casesPlugin.getCaseSummary(c, true, msg.author.id));
 
+        const isLastPage = page === totalPages;
         const firstCaseNum = (page - 1) * casesPerPage + 1;
-        const lastCaseNum = page * casesPerPage;
+        const lastCaseNum = isLastPage ? totalCases : page * casesPerPage;
         const title = `Most recent cases ${firstCaseNum}-${lastCaseNum} of ${totalCases} by ${modName}`;
 
         const embed = {
@@ -61,8 +61,8 @@ export const CasesModCmd = modActionsCmd({
             name: title,
             icon_url: mod instanceof UnknownUser ? undefined : mod.displayAvatarURL(),
           },
+          description: lines.join("\n"),
           fields: [
-            ...getChunkedEmbedFields(emptyEmbedValue, lines.join("\n")),
             {
               name: emptyEmbedValue,
               value: trimLines(`

backend/src/plugins/ModActions/commands/CasesUserCmd.ts

@@ -1,4 +1,4 @@
-import { APIEmbed } from "discord.js";
+import { APIEmbed, User } from "discord.js";
 import { commandTypeHelpers as ct } from "../../../commandTypes";
 import { CaseTypes } from "../../../data/CaseTypes";
 import { sendErrorMessage } from "../../../pluginUtils";
@@ -10,10 +10,9 @@ import {
   renderUsername,
   resolveMember,
   resolveUser,
-  trimLines,
 } from "../../../utils";
 import { asyncMap } from "../../../utils/async";
-import { getChunkedEmbedFields } from "../../../utils/getChunkedEmbedFields";
+import { createPaginatedMessage } from "../../../utils/createPaginatedMessage.js";
 import { getGuildPrefix } from "../../../utils/getGuildPrefix";
 import { modActionsCmd } from "../types";
 
@@ -29,6 +28,8 @@ const opts = {
   unbans: ct.switchOption({ def: false, shortcut: "ub" }),
 };
 
+const casesPerPage = 10;
+
 export const CasesUserCmd = modActionsCmd({
   trigger: ["cases", "modlogs"],
   permission: "can_view",
@@ -100,49 +101,55 @@ export const CasesUserCmd = modActionsCmd({
       } else {
         // Compact view (= regular message with a preview of each case)
         const casesPlugin = pluginData.getPlugin(CasesPlugin);
-        const lines = await asyncMap(casesToDisplay, (c) => casesPlugin.getCaseSummary(c, true, msg.author.id));
 
+        const totalPages = Math.max(Math.ceil(cases.length / casesPerPage), 1);
         const prefix = getGuildPrefix(pluginData);
-        const linesPerChunk = 10;
-        const lineChunks = chunkArray(lines, linesPerChunk);
 
-        const footerField = {
+        createPaginatedMessage(
-          name: emptyEmbedValue,
+          pluginData.client,
-          value: trimLines(`
+          msg.channel,
-            Use \`${prefix}case <num>\` to see more information about an individual case
+          totalPages,
-          `),
+          async (page) => {
-        };
+            const chunkedCases = chunkArray(cases, casesPerPage)[page - 1];
+            const lines = await asyncMap(chunkedCases, (c) => casesPlugin.getCaseSummary(c, true, msg.author.id));
 
-        for (const [i, linesInChunk] of lineChunks.entries()) {
+            const isLastPage = page === totalPages;
-          const isLastChunk = i === lineChunks.length - 1;
+            const firstCaseNum = (page - 1) * casesPerPage + 1;
-
+            const lastCaseNum = isLastPage ? cases.length : page * casesPerPage;
-          if (isLastChunk && !args.hidden && hiddenCases.length) {
+            const title =
-            if (hiddenCases.length === 1) {
+              totalPages === 1
-              linesInChunk.push(`*+${hiddenCases.length} hidden case, use "-hidden" to show it*`);
+                ? `Cases for ${userName} (${lines.length} total)`
-            } else {
+                : `Most recent cases ${firstCaseNum}-${lastCaseNum} of ${cases.length} for ${userName}`;
-              linesInChunk.push(`*+${hiddenCases.length} hidden cases, use "-hidden" to show them*`);
-            }
-          }
-
-          const chunkStart = i * linesPerChunk + 1;
-          const chunkEnd = Math.min((i + 1) * linesPerChunk, lines.length);
 
             const embed = {
               author: {
-              name:
+                name: title,
-                lineChunks.length === 1
+                icon_url: user instanceof User ? user.displayAvatarURL() : undefined,
-                  ? `Cases for ${userName} (${lines.length} total)`
-                  : `Cases ${chunkStart}–${chunkEnd} of ${lines.length} for ${userName}`,
-              icon_url: user.displayAvatarURL(),
               },
+              description: lines.join("\n"),
               fields: [
-              ...getChunkedEmbedFields(emptyEmbedValue, linesInChunk.join("\n")),
+                {
-              ...(isLastChunk ? [footerField] : []),
+                  name: emptyEmbedValue,
+                  value: `Use \`${prefix}case <num>\` to see more information about an individual case`,
+                },
               ],
             } satisfies APIEmbed;
 
-          msg.channel.send({ embeds: [embed] });
+            if (isLastPage && !args.hidden && hiddenCases.length)
-        }
+              embed.fields.push({
+                name: emptyEmbedValue,
+                value:
+                  hiddenCases.length === 1
+                    ? `*+${hiddenCases.length} hidden case, use "-hidden" to show it*`
+                    : `*+${hiddenCases.length} hidden cases, use "-hidden" to show them*`,
+              });
+
+            return { embeds: [embed] };
+          },
+          {
+            limitToUserId: msg.author.id,
+          },
+        );
       }
     }
   },