diff --git a/server/internal/service/util.go b/server/internal/service/util.go index 32060b3..646301e 100644 --- a/server/internal/service/util.go +++ b/server/internal/service/util.go @@ -225,6 +225,7 @@ func parseTitleExpiration(title *string) (*time.Time, error) { // Set midnight at the end of the specified day (+0000 UTC) expiresAt = time.Date(expiresAt.Year(), expiresAt.Month(), expiresAt.Day(), 23, 59, 59, 0, time.UTC) + log.Debug().Msgf("Parsed absolute expiration date '%s' from input '%s'", expiresAt, dateStr) return &expiresAt, nil } @@ -261,6 +262,7 @@ func parseTitleExpiration(title *string) (*time.Time, error) { // Set midnight at the end of the specified day (+0000 UTC) expiresAt = time.Date(expiresAt.Year(), expiresAt.Month(), expiresAt.Day(), 23, 59, 59, 0, time.UTC) + log.Debug().Msgf("Parsed relative expiration date '%s' from input '%s%s'", expiresAt, amount, unit) return &expiresAt, nil } diff --git a/web/src/lib/util/contentVisual.ts b/web/src/lib/util/contentVisual.ts index c6ae4af..57413be 100644 --- a/web/src/lib/util/contentVisual.ts +++ b/web/src/lib/util/contentVisual.ts @@ -17,17 +17,17 @@ export const formatDateLong = (dateString: string | Date): string => { }) } -export const formatDateShort = (dateString: string | Date): string => { - if (!dateString) { +export const formatDateShort = (input: string | Date): string => { + console.log(input) + + if (!input) { return "" } - const d = new Date(dateString) - return d.toLocaleDateString(undefined, { - weekday: "short", - year: "2-digit", - month: "short" - }) + const d = input instanceof Date ? input : new Date(input) + const utcDate = new Date(d.getTime()) + + return `${utcDate.toLocaleString("en", { weekday: "short", day: "numeric", month: "short", year: "2-digit", timeZone: "UTC" })} UTC` } export const parseExpirationPrefix = (title: string): [string, string] => {