From d2f3999cf1c3962f6dae55e0e4cac1215cfdb8cb Mon Sep 17 00:00:00 2001 From: diced Date: Mon, 31 Oct 2022 16:43:12 -0700 Subject: [PATCH] fix: expires/expired text change --- src/components/pages/Invites.tsx | 10 +++------- src/lib/utils/client.ts | 11 +++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/components/pages/Invites.tsx b/src/components/pages/Invites.tsx index 9e24fad01..9f3f66620 100644 --- a/src/components/pages/Invites.tsx +++ b/src/components/pages/Invites.tsx @@ -22,7 +22,7 @@ import MutedText from 'components/MutedText'; import useFetch from 'hooks/useFetch'; import { useRouter } from 'next/router'; import { useEffect, useState } from 'react'; -import { relativeTime } from 'lib/utils/client'; +import { expireText, relativeTime } from 'lib/utils/client'; const expires = ['30m', '1h', '6h', '12h', '1d', '3d', '5d', '7d', 'never']; @@ -202,16 +202,12 @@ export default function Uz2sers() {
- - Created: {relativeTime(new Date(invite.created_at))} - + Created {relativeTime(new Date(invite.created_at))}
- - Expires: {relativeTime(new Date(invite.expires_at))} - + {expireText(invite.expires_at)}
diff --git a/src/lib/utils/client.ts b/src/lib/utils/client.ts index 6c855aae1..9896a2aba 100644 --- a/src/lib/utils/client.ts +++ b/src/lib/utils/client.ts @@ -91,3 +91,14 @@ export function percentChange(initial: number, final: number) { export function capitalize(str: string) { return str[0].toUpperCase() + str.slice(1).toLowerCase(); } + +export function expireText(to_: string, from_: string = new Date().toLocaleString()) { + const from = new Date(from_); + const to = new Date(to_); + + if (from.getTime() < to.getTime()) { + return `Expires ${dayjs(to).from(from)}`; + } else { + return `Expired ${dayjs(from).to(to)}`; + } +}