Merge pull request #454 from ZeppelinBot/metal0-fix-member-cases

Some fixes to !cases (continued)
ZeppelinBot · Jan 27, 2024 · 4850749 · 4850749
2 parents c3601ae + 90c7024
commit 4850749
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 55 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 { 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";
@@ -52,17 +51,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 UnknownUser ? undefined : mod.displayAvatarURL(),
  },
+ 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
@@ -1,19 +1,11 @@
-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";
 import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
-import {
- UnknownUser,
- chunkArray,
- emptyEmbedValue,
- renderUsername,
- resolveMember,
- resolveUser,
- trimLines,
-} from "../../../utils";
+import { UnknownUser, chunkArray, emptyEmbedValue, renderUsername, resolveMember, resolveUser } 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 +21,8 @@ const opts = {
  unbans: ct.switchOption({ def: false, shortcut: "ub" }),
 };
 
+const casesPerPage = 5;
+
 export const CasesUserCmd = modActionsCmd({
  trigger: ["cases", "modlogs"],
  permission: "can_view",
@@ -100,49 +94,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 = {
- name: emptyEmbedValue,
- value: trimLines(`
- Use \`${prefix}case <num>\` to see more information about an individual case
- `),
- };
-
- for (const [i, linesInChunk] of lineChunks.entries()) {
- const isLastChunk = i === lineChunks.length - 1;
-
- if (isLastChunk && !args.hidden && hiddenCases.length) {
- if (hiddenCases.length === 1) {
- linesInChunk.push(`*+${hiddenCases.length} hidden case, use "-hidden" to show it*`);
- } else {
- 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:
- lineChunks.length === 1
- ? `Cases for ${userName} (${lines.length} total)`
- : `Cases ${chunkStart}–${chunkEnd} of ${lines.length} for ${userName}`,
- icon_url: user.displayAvatarURL(),
- },
- fields: [
- ...getChunkedEmbedFields(emptyEmbedValue, linesInChunk.join("\n")),
- ...(isLastChunk ? [footerField] : []),
- ],
- } satisfies APIEmbed;
-
- msg.channel.send({ embeds: [embed] });
- }
+
+ createPaginatedMessage(
+ pluginData.client,
+ msg.channel,
+ totalPages,
+ async (page) => {
+ const chunkedCases = chunkArray(cases, casesPerPage)[page - 1];
+ const lines = await asyncMap(chunkedCases, (c) => casesPlugin.getCaseSummary(c, true, msg.author.id));
+
+ const isLastPage = page === totalPages;
+ const firstCaseNum = (page - 1) * casesPerPage + 1;
+ const lastCaseNum = isLastPage ? cases.length : page * casesPerPage;
+ const title =
+ totalPages === 1
+ ? `Cases for ${userName} (${lines.length} total)`
+ : `Most recent cases ${firstCaseNum}-${lastCaseNum} of ${cases.length} for ${userName}`;
+
+ const embed = {
+ author: {
+ name: title,
+ icon_url: user instanceof User ? user.displayAvatarURL() : undefined,
+ },
+ description: lines.join("\n"),
+ fields: [
+ {
+ name: emptyEmbedValue,
+ value: `Use \`${prefix}case <num>\` to see more information about an individual case`,
+ },
+ ],
+ } satisfies APIEmbed;
+
+ 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,
+ },
+ );
  }
  }
  },