move embed fields to embed description

Signed-off-by: GitHub <[email protected]>
ZeppelinBot · Nov 26, 2023 · 14b8420 · 14b8420
1 parent 6c0d27d
commit 14b8420
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/backend/src/plugins/ModActions/commands/CasesModCmd.ts b/backend/src/plugins/ModActions/commands/CasesModCmd.ts
@@ -4,7 +4,6 @@ import { sendErrorMessage } from "../../../pluginUtils";
 import { emptyEmbedValue, 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"],
@@ -50,17 +49,18 @@ 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 = {
           author: {
             name: title,
             icon_url: mod instanceof User ? mod.displayAvatarURL() : undefined,
           },
+          description: lines.join("\n"),
           fields: [
-            ...getChunkedEmbedFields(emptyEmbedValue, lines.join("\n")),
             {
               name: emptyEmbedValue,
               value: trimLines(`

diff --git a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts
@@ -6,7 +6,6 @@ import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
 import { UnknownUser, chunkArray, emptyEmbedValue, renderUserUsername, resolveUser, trimLines } from "../../../utils";
 import { asyncMap } from "../../../utils/async";
 import { createPaginatedMessage } from "../../../utils/createPaginatedMessage.js";
-import { getChunkedEmbedFields } from "../../../utils/getChunkedEmbedFields";
 import { getGuildPrefix } from "../../../utils/getGuildPrefix";
 import { modActionsCmd } from "../types";
 
@@ -107,7 +106,7 @@ export const CasesUserCmd = modActionsCmd({
 
             const isLastPage = page === totalPages;
             const firstCaseNum = (page - 1) * casesPerPage + 1;
-            const lastCaseNum = page * casesPerPage;
+            const lastCaseNum = isLastPage ? cases.length : page * casesPerPage;
             const title =
               totalPages === 1
                 ? `Cases for ${userName} (${lines.length} total)`
@@ -118,13 +117,11 @@ export const CasesUserCmd = modActionsCmd({
                 name: title,
                 icon_url: user instanceof User ? user.displayAvatarURL() : undefined,
               },
+              description: lines.join("\n"),
               fields: [
-                ...getChunkedEmbedFields(emptyEmbedValue, lines.join("\n")),
                 {
                   name: emptyEmbedValue,
-                  value: trimLines(`
-                    Use \`${prefix}case <num>\` to see more information about an individual case
-                  `),
+                  value: trimLines(`Use \`${prefix}case <num>\` to see more information about an individual case`),
                 },
               ],
             } satisfies APIEmbed;