diff --git a/apps/yuudachi/locales/en-US/translation.json b/apps/yuudachi/locales/en-US/translation.json index 61854c5a6..086ccb536 100644 --- a/apps/yuudachi/locales/en-US/translation.json +++ b/apps/yuudachi/locales/en-US/translation.json @@ -539,7 +539,7 @@ "mod_log": { "case_log": { "description": "**Member**: `{{- target_tag}}` ({{target_id}})\n**Action**: {{- action}}", - "expiration": "\n**Expiration**: {{- time}}", + "duration": "\n**Duration**: `{{- time}}` {{- timestamp}}", "context": "**Context:** {{- link}}", "context_sub": "Beam me up, Yuu", "reason": "\n**Reason:** {{- reason}}", diff --git a/apps/yuudachi/src/functions/logging/generateCaseLog.ts b/apps/yuudachi/src/functions/logging/generateCaseLog.ts index 58802e748..b43f4ddeb 100644 --- a/apps/yuudachi/src/functions/logging/generateCaseLog.ts +++ b/apps/yuudachi/src/functions/logging/generateCaseLog.ts @@ -1,3 +1,4 @@ +import { ms } from "@naval-base/ms"; import { logger, kSQL, container } from "@yuudachi/framework"; import { Client, type Snowflake, hyperlink, time, TimestampStyles, messageLink, channelLink } from "discord.js"; import i18next from "i18next"; @@ -36,8 +37,11 @@ export async function generateCaseLog(case_: Case, logChannelId: Snowflake, loca }); if (case_.actionExpiration) { - msg += i18next.t("log.mod_log.case_log.expiration", { - time: time(new Date(case_.actionExpiration), TimestampStyles.RelativeTime), + const expirationDate = new Date(case_.actionExpiration); + + msg += i18next.t("log.mod_log.case_log.duration", { + time: ms(expirationDate.getTime() - Date.now()), + timestamp: time(expirationDate, TimestampStyles.RelativeTime), lng: locale, }); }