From c8087219381c72233af7aef3bfd60fc587d479c4 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 30 May 2023 15:46:43 -0400 Subject: Spelling (#772) * spelling: account Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: activated Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: additional Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: appropriate Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: bskyweb Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: description Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: display Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: highlighted Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: javascript Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: locally-hosted Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: notification Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: occurring Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: parenthetical Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: preexisting Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: prefetched Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: punctuation Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> * spelling: simplicity Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --------- Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- __tests__/lib/string.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '__tests__/lib/string.test.ts') diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts index f25bd02a7..936708cf2 100644 --- a/__tests__/lib/string.test.ts +++ b/__tests__/lib/string.test.ts @@ -48,7 +48,7 @@ describe('detectLinkables', () => { 'Classic article https://socket3.wordpress.com/2018/02/03/designing-windows-95s-user-interface/ ', 'https://foo.com https://bar.com/whatever https://baz.com', 'punctuation https://foo.com, https://bar.com/whatever; https://baz.com.', - 'parenthentical (https://foo.com)', + 'parenthetical (https://foo.com)', 'except for https://foo.com/thing_(cool)', ] const outputs = [ @@ -112,7 +112,7 @@ describe('detectLinkables', () => { {link: 'https://baz.com'}, '.', ], - ['parenthentical (', {link: 'https://foo.com'}, ')'], + ['parenthetical (', {link: 'https://foo.com'}, ')'], ['except for ', {link: 'https://foo.com/thing_(cool)'}], ] it('correctly handles a set of text inputs', () => { -- cgit 1.4.1 From f2cf1d8c793dee5cd6a0a4cd1b75ea795311afb7 Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Sat, 20 May 2023 14:45:30 -0400 Subject: show date after 7 days, closes #754 adjust the behavior of ago() to show the date after a week --- __tests__/lib/string.test.ts | 10 +++++++--- src/lib/strings/time.ts | 10 ++++------ 2 files changed, 11 insertions(+), 9 deletions(-) (limited to '__tests__/lib/string.test.ts') diff --git a/__tests__/lib/string.test.ts b/__tests__/lib/string.test.ts index 936708cf2..75d7b8421 100644 --- a/__tests__/lib/string.test.ts +++ b/__tests__/lib/string.test.ts @@ -176,16 +176,20 @@ describe('ago', () => { new Date().setMinutes(new Date().getMinutes() - 10), new Date().setHours(new Date().getHours() - 1), new Date().setDate(new Date().getDate() - 1), + new Date().setDate(new Date().getDate() - 6), + new Date().setDate(new Date().getDate() - 7), new Date().setMonth(new Date().getMonth() - 1), ] const outputs = [ - new Date(1671461038).toLocaleDateString(), - new Date('04 Dec 1995 00:12:00 GMT').toLocaleDateString(), + new Date(1671461038).toLocaleDateString('en-us', {year: 'numeric', month: 'short', day: 'numeric'}), + new Date('04 Dec 1995 00:12:00 GMT').toLocaleDateString('en-us', {year: 'numeric', month: 'short', day: 'numeric'}), '0s', '10m', '1h', '1d', - '1mo', + '6d', + new Date(new Date().setDate(new Date().getDate() - 7)).toLocaleDateString('en-us', {year: 'numeric', month: 'short', day: 'numeric'}), + new Date(new Date().setMonth(new Date().getMonth() - 1)).toLocaleDateString('en-us', {year: 'numeric', month: 'short', day: 'numeric'}), ] it('correctly calculates how much time passed, in a string', () => { diff --git a/src/lib/strings/time.ts b/src/lib/strings/time.ts index 588b84459..40a307c30 100644 --- a/src/lib/strings/time.ts +++ b/src/lib/strings/time.ts @@ -1,8 +1,8 @@ const MINUTE = 60 const HOUR = MINUTE * 60 const DAY = HOUR * 24 -const MONTH = DAY * 28 -const YEAR = DAY * 365 +const WEEK = DAY * 7 + export function ago(date: number | string | Date): string { let ts: number if (typeof date === 'string') { @@ -19,12 +19,10 @@ export function ago(date: number | string | Date): string { return `${Math.floor(diffSeconds / MINUTE)}m` } else if (diffSeconds < DAY) { return `${Math.floor(diffSeconds / HOUR)}h` - } else if (diffSeconds < MONTH) { + } else if (diffSeconds < WEEK) { return `${Math.floor(diffSeconds / DAY)}d` - } else if (diffSeconds < YEAR) { - return `${Math.floor(diffSeconds / MONTH)}mo` } else { - return new Date(ts).toLocaleDateString() + return new Date(ts).toLocaleDateString('en-us', {year: 'numeric', month: 'short', day: 'numeric'}) } } -- cgit 1.4.1