From 8f9b231487cfc22aa25f6103db94e755e9e4c544 Mon Sep 17 00:00:00 2001 From: SleeplessOne1917 Date: Fri, 23 Jun 2023 10:33:07 -0400 Subject: [PATCH] Make date distance format use correct verbiage --- src/shared/components/common/moment-time.tsx | 7 +++---- src/shared/components/modlog.tsx | 13 ++++--------- src/shared/utils/helpers/format-past-date.ts | 12 ++++++++++++ src/shared/utils/helpers/index.ts | 2 ++ 4 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 src/shared/utils/helpers/format-past-date.ts diff --git a/src/shared/components/common/moment-time.tsx b/src/shared/components/common/moment-time.tsx index eefeeda..fc83ab4 100644 --- a/src/shared/components/common/moment-time.tsx +++ b/src/shared/components/common/moment-time.tsx @@ -1,6 +1,5 @@ -import { capitalizeFirstLetter } from "@utils/helpers"; +import { capitalizeFirstLetter, formatPastDate } from "@utils/helpers"; import format from "date-fns/format"; -import formatDistanceToNow from "date-fns/formatDistanceToNow"; import parseISO from "date-fns/parseISO"; import { Component } from "inferno"; import { I18NextService } from "../../services"; @@ -43,7 +42,7 @@ export class MomentTime extends Component { className="moment-time font-italics pointer unselectable" > - {formatDistanceToNow(parseISO(this.props.updated))} + {formatPastDate(this.props.updated)} ); } else { @@ -53,7 +52,7 @@ export class MomentTime extends Component { className="moment-time pointer unselectable" data-tippy-content={momentFormat(published)} > - {formatDistanceToNow(parseISO(published))} + {formatPastDate(published)} ); } diff --git a/src/shared/components/modlog.tsx b/src/shared/components/modlog.tsx index 0d5afba..f12f5b6 100644 --- a/src/shared/components/modlog.tsx +++ b/src/shared/components/modlog.tsx @@ -7,6 +7,7 @@ import { } from "@utils/app"; import { debounce, + formatPastDate, getIdFromString, getPageFromString, getQueryParams, @@ -15,8 +16,6 @@ import { import { amAdmin, amMod } from "@utils/roles"; import type { QueryParams } from "@utils/types"; import { Choice, RouteDataResponse } from "@utils/types"; -import formatDistanceToNowStrict from "date-fns/formatDistanceToNowStrict"; -import parseISO from "date-fns/parseISO"; import { NoOptionI18nKeys } from "i18next"; import { Component, linkEvent } from "inferno"; import { T } from "inferno-i18next-dess"; @@ -119,10 +118,6 @@ function getActionFromString(action?: string): ModlogActionType { return action !== undefined ? (action as ModlogActionType) : "All"; } -function getExpires(expires: string) { - return formatDistanceToNowStrict(parseISO(expires)); -} - const getModlogActionMapper = ( actionType: ModlogActionType, @@ -376,7 +371,7 @@ function renderModlogType({ type_, view }: ModlogType) { )} {expires && ( -
expires: {getExpires(expires)}
+
expires: {formatPastDate(expires)}
)} @@ -408,7 +403,7 @@ function renderModlogType({ type_, view }: ModlogType) { )} {expires && ( -
expires: {getExpires(expires)}
+
expires: {formatPastDate(expires)}
)} @@ -472,7 +467,7 @@ function renderModlogType({ type_, view }: ModlogType) { )} {expires && ( -
expires: {getExpires(expires)}
+
expires: {formatPastDate(expires)}
)} diff --git a/src/shared/utils/helpers/format-past-date.ts b/src/shared/utils/helpers/format-past-date.ts new file mode 100644 index 0000000..78bc2a2 --- /dev/null +++ b/src/shared/utils/helpers/format-past-date.ts @@ -0,0 +1,12 @@ +import formatDistanceStrict from "date-fns/formatDistanceStrict"; +import parseISO from "date-fns/parseISO"; + +export default function (dateString?: string) { + return formatDistanceStrict( + parseISO(dateString ?? Date.now().toString()), + new Date(), + { + addSuffix: true, + } + ); +} diff --git a/src/shared/utils/helpers/index.ts b/src/shared/utils/helpers/index.ts index 36ae83f..3420adb 100644 --- a/src/shared/utils/helpers/index.ts +++ b/src/shared/utils/helpers/index.ts @@ -1,6 +1,7 @@ import capitalizeFirstLetter from "./capitalize-first-letter"; import debounce from "./debounce"; import editListImmutable from "./edit-list-immutable"; +import formatPastDate from "./format-past-date"; import futureDaysToUnixTime from "./future-days-to-unix-time"; import getIdFromString from "./get-id-from-string"; import getPageFromString from "./get-page-from-string"; @@ -26,6 +27,7 @@ export { capitalizeFirstLetter, debounce, editListImmutable, + formatPastDate, futureDaysToUnixTime, getIdFromString, getPageFromString, -- 2.44.1