From 56dde84bbda5a13c43dac7f26e122ee8683162e6 Mon Sep 17 00:00:00 2001 From: almeidx Date: Sun, 2 Jun 2024 16:43:57 +0100 Subject: [PATCH 1/2] style: fmt --- backend/src/api/guilds/importExport.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/api/guilds/importExport.ts b/backend/src/api/guilds/importExport.ts index 0ce0f3f5..73d8af2f 100644 --- a/backend/src/api/guilds/importExport.ts +++ b/backend/src/api/guilds/importExport.ts @@ -75,8 +75,9 @@ export function initGuildsImportExportAPI(guildRouter: express.Router) { try { data = importExportData.parse(req.body.data); } catch (err) { - const prettyMessage = `${err.issues[0].code}: expected ${err.issues[0].expected}, received ${err.issues[0].received - } at /${err.issues[0].path.join("/")}`; + const prettyMessage = `${err.issues[0].code}: expected ${err.issues[0].expected}, received ${ + err.issues[0].received + } at /${err.issues[0].path.join("/")}`; return clientError(res, `Invalid import data format: ${prettyMessage}`); return; } From 4fa77d57dfb3c97a3aa8823e4a683d82032c5e7e Mon Sep 17 00:00:00 2001 From: rubyowo Date: Sun, 2 Jun 2024 15:59:41 +0000 Subject: [PATCH 2/2] fix: dont show hidden cases without -hidden arg (#477) * fix: dont show hidden cases without -hidden arg * fix: almeida has eagle eyes --- backend/src/plugins/ModActions/commands/CasesUserCmd.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts index 7380443d..c836c079 100644 --- a/backend/src/plugins/ModActions/commands/CasesUserCmd.ts +++ b/backend/src/plugins/ModActions/commands/CasesUserCmd.ts @@ -102,7 +102,7 @@ export const CasesUserCmd = modActionsCmd({ // Compact view (= regular message with a preview of each case) const casesPlugin = pluginData.getPlugin(CasesPlugin); - const totalPages = Math.max(Math.ceil(cases.length / casesPerPage), 1); + const totalPages = Math.max(Math.ceil(casesToDisplay.length / casesPerPage), 1); const prefix = getGuildPrefix(pluginData); createPaginatedMessage( @@ -110,16 +110,16 @@ export const CasesUserCmd = modActionsCmd({ msg.channel, totalPages, async (page) => { - const chunkedCases = chunkArray(cases, casesPerPage)[page - 1]; + const chunkedCases = chunkArray(casesToDisplay, 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 lastCaseNum = isLastPage ? casesToDisplay.length : page * casesPerPage; const title = totalPages === 1 ? `Cases for ${userName} (${lines.length} total)` - : `Most recent cases ${firstCaseNum}-${lastCaseNum} of ${cases.length} for ${userName}`; + : `Most recent cases ${firstCaseNum}-${lastCaseNum} of ${casesToDisplay.length} for ${userName}`; const embed = { author: {