zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Revert "show date after 7 days closes #754" (#860)

zio/stable
Ansh 2023-06-08 09:32:56 -07:00 committed by GitHub
parent 007d12e182
commit b3e7801796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
__tests__/lib/string.test.ts
View File

@ -176,20 +176,16 @@ describe('ago', () => {
new Date().setMinutes(new Date().getMinutes() - 10), new Date().setMinutes(new Date().getMinutes() - 10),
new Date().setHours(new Date().getHours() - 1), new Date().setHours(new Date().getHours() - 1),
new Date().setDate(new Date().getDate() - 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), new Date().setMonth(new Date().getMonth() - 1),
] ]
const outputs = [ const outputs = [
new Date(1671461038).toLocaleDateString('en-us', {year: 'numeric', month: 'short', day: 'numeric'}), new Date(1671461038).toLocaleDateString(),
new Date('04 Dec 1995 00:12:00 GMT').toLocaleDateString('en-us', {year: 'numeric', month: 'short', day: 'numeric'}), new Date('04 Dec 1995 00:12:00 GMT').toLocaleDateString(),
'0s', '0s',
'10m', '10m',
'1h', '1h',
'1d', '1d',
'6d', '1mo',
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', () => { it('correctly calculates how much time passed, in a string', () => {

14
src/lib/strings/time.ts
View File

@ -1,8 +1,8 @@
const MINUTE = 60 const MINUTE = 60
const HOUR = MINUTE * 60 const HOUR = MINUTE * 60
const DAY = HOUR * 24 const DAY = HOUR * 24
const WEEK = DAY * 7 const MONTH = DAY * 28
const YEAR = DAY * 365
export function ago(date: number | string | Date): string { export function ago(date: number | string | Date): string {
let ts: number let ts: number
if (typeof date === 'string') { if (typeof date === 'string') {
@ -19,14 +19,12 @@ export function ago(date: number | string | Date): string {
return `${Math.floor(diffSeconds / MINUTE)}m` return `${Math.floor(diffSeconds / MINUTE)}m`
} else if (diffSeconds < DAY) { } else if (diffSeconds < DAY) {
return `${Math.floor(diffSeconds / HOUR)}h` return `${Math.floor(diffSeconds / HOUR)}h`
} else if (diffSeconds < WEEK) { } else if (diffSeconds < MONTH) {
return `${Math.floor(diffSeconds / DAY)}d` return `${Math.floor(diffSeconds / DAY)}d`
} else if (diffSeconds < YEAR) {
return `${Math.floor(diffSeconds / MONTH)}mo`
} else { } else {
return new Date(ts).toLocaleDateString('en-us', { return new Date(ts).toLocaleDateString()
year: 'numeric',
month: 'short',
day: 'numeric',
})
} }
} }