From 58adc0ef082f8f30d2f2d171205fba9e9e70f785 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Tue, 18 Jun 2024 09:24:04 -0500
Subject: [PATCH] Add long format

---
 src/lib/strings/time.ts | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/lib/strings/time.ts b/src/lib/strings/time.ts
index d95b9a0cbd..ce98afce78 100644
--- a/src/lib/strings/time.ts
+++ b/src/lib/strings/time.ts
@@ -1,3 +1,4 @@
+import {plural} from '@lingui/macro'
 import {differenceInSeconds} from 'date-fns'
 
 export function ago(date: number | string | Date): string {
@@ -18,24 +19,46 @@ const MONTH_30 = DAY * 30
 export function dateDiff(
   earlier: number | string | Date,
   later: number | string | Date,
+  options?: {
+    format?: 'long' | 'short'
+  },
 ): string {
+  const format = options?.format || 'short'
+  const long = format === 'long'
   const diffSeconds = differenceInSeconds(new Date(later), new Date(earlier))
+
   if (diffSeconds < NOW) {
     return `now`
   } else if (diffSeconds < MINUTE) {
-    return `${diffSeconds}s`
+    return `${diffSeconds}${
+      long ? ` ${plural(diffSeconds, {one: 'second', other: 'seconds'})}` : 's'
+    }`
   } else if (diffSeconds < HOUR) {
-    return `${Math.floor(diffSeconds / MINUTE)}m`
+    const diff = Math.floor(diffSeconds / MINUTE)
+    return `${diff}${
+      long ? ` ${plural(diff, {one: 'minute', other: 'minutes'})}` : 'm'
+    }`
   } else if (diffSeconds < DAY) {
-    return `${Math.floor(diffSeconds / HOUR)}h`
+    const diff = Math.floor(diffSeconds / HOUR)
+    return `${diff}${
+      long ? ` ${plural(diff, {one: 'hour', other: 'hours'})}` : 'h'
+    }`
   } else if (diffSeconds < MONTH_30) {
-    return `${Math.floor(diffSeconds / DAY)}d`
+    const diff = Math.floor(diffSeconds / DAY)
+    return `${diff}${
+      long ? ` ${plural(diff, {one: 'day', other: 'days'})}` : 'd'
+    }`
   } else {
     const diffMonths30 = Math.floor(diffSeconds / MONTH_30)
     if (diffMonths30 < 12) {
-      return `${diffMonths30}mo`
+      return `${diffMonths30}${long ? ' months' : 'mo'}`
     } else {
-      return new Date(earlier).toLocaleDateString()
+      const str = new Date(earlier).toLocaleDateString()
+
+      if (long) {
+        return `on ${str}`
+      }
+      return str
     }
   }
 }