From ce4b65cd35af203f4fdb0727072258c2276dd972 Mon Sep 17 00:00:00 2001 From: iamshoXy Date: Fri, 19 Apr 2024 19:24:14 +0200 Subject: [PATCH] Case display changes --- backend/src/data/GuildCases.ts | 3 +++ backend/src/plugins/Cases/functions/getCaseSummary.ts | 8 ++++---- backend/src/plugins/ModActions/commands/CasesUserCmd.ts | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/src/data/GuildCases.ts b/backend/src/data/GuildCases.ts index 0e8bc927..8ec6e8a0 100644 --- a/backend/src/data/GuildCases.ts +++ b/backend/src/data/GuildCases.ts @@ -74,6 +74,9 @@ export class GuildCases extends BaseGuildRepository { where: { user_id: userId, }, + order: { + created_at: "DESC", + }, }); } diff --git a/backend/src/plugins/Cases/functions/getCaseSummary.ts b/backend/src/plugins/Cases/functions/getCaseSummary.ts index 3c9989ed..469facff 100644 --- a/backend/src/plugins/Cases/functions/getCaseSummary.ts +++ b/backend/src/plugins/Cases/functions/getCaseSummary.ts @@ -8,9 +8,9 @@ import { caseAbbreviations } from "../caseAbbreviations"; import { CasesPluginType } from "../types"; import { getCaseIcon } from "./getCaseIcon"; -const CASE_SUMMARY_REASON_MAX_LENGTH = 300; +const CASE_SUMMARY_REASON_MAX_LENGTH = 682; const INCLUDE_MORE_NOTES_THRESHOLD = 20; -const UPDATE_STR = "**[Update]**"; +const UPDATE_STR = "\n**[Update]**"; export async function getCaseSummary( pluginData: GuildPluginData, @@ -31,7 +31,7 @@ export async function getCaseSummary( for (let i = 1; i < theCase.notes.length; i++) { if (reason.length >= CASE_SUMMARY_REASON_MAX_LENGTH - UPDATE_STR.length - INCLUDE_MORE_NOTES_THRESHOLD) break; - reason += ` ${UPDATE_STR} ${theCase.notes[i].body}`; + reason += ` ${UPDATE_STR} ${theCase.notes[i].body}\n`; leftoverNotes--; } @@ -67,7 +67,7 @@ export async function getCaseSummary( let caseType = (caseAbbreviations[theCase.type] || String(theCase.type)).toUpperCase(); caseType = (caseType + " ").slice(0, 4); - let line = `${icon} **\`${caseType}\`** \`[${prettyTimestamp}]\` ${caseTitle} **Mod:** ${theCase.mod_name}\n${reason}`; + let line = `${icon} **\`${caseType}\`** \`[${prettyTimestamp}]\` ${caseTitle} **Moderator:** ${theCase.mod_name}\n${reason}`; if (leftoverNotes > 1) { line += ` *(+${leftoverNotes} ${leftoverNotes === 1 ? "note" : "notes"})*`; } diff --git a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts index 08e586c8..ae9c65af 100644 --- a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts +++ b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts @@ -21,7 +21,7 @@ const opts = { unbans: ct.switchOption({ def: false, shortcut: "ub" }), }; -const casesPerPage = 5; +const casesPerPage = 6; export const CasesUserCmd = modActionsCmd({ trigger: ["cases", "modlogs"],