Skip to content

Commit 31f92e9

Browse files
committed
fix: enhance big time formatting in formatElapsedTime function
1 parent 035f880 commit 31f92e9

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

src/utils/formatElapsedTime.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ export function formatElapsedTime(timestamp: string | number): string {
1616
if (elapsedTime / 1000 / 60 / 60 > -24) {
1717
return 'in ' + (-elapsedTime / 1000 / 60 / 60).toFixed(0) + 'h';
1818
}
19-
return 'in the future';
19+
if (elapsedTime / 1000 / 60 / 60 / 24 > -30) {
20+
return 'in ' + (-elapsedTime / 1000 / 60 / 60 / 24).toFixed(0) + 'd';
21+
}
22+
if (elapsedTime / 1000 / 60 / 60 / 24 / 30.44 > -12) {
23+
return 'in ' + (-elapsedTime / 1000 / 60 / 60 / 24 / 30.44).toFixed(0) + 'mo';
24+
}
25+
return 'in ' + (-elapsedTime / 1000 / 60 / 60 / 24 / 365.25).toFixed(0) + 'y';
2026
}
2127

2228
if (elapsedTime / 1000 < 60) {
@@ -28,7 +34,13 @@ export function formatElapsedTime(timestamp: string | number): string {
2834
if (elapsedTime / 1000 / 60 / 60 < 24) {
2935
return (elapsedTime / 1000 / 60 / 60).toFixed(0) + 'h ago';
3036
}
31-
return (elapsedTime / 1000 / 60 / 60 / 24).toFixed(0) + 'd ago';
37+
if (elapsedTime / 1000 / 60 / 60 / 24 < 30) {
38+
return (elapsedTime / 1000 / 60 / 60 / 24).toFixed(0) + 'd ago';
39+
}
40+
if (elapsedTime / 1000 / 60 / 60 / 24 / 30.44 < 12) {
41+
return (elapsedTime / 1000 / 60 / 60 / 24 / 30.44).toFixed(0) + 'mo ago';
42+
}
43+
return (elapsedTime / 1000 / 60 / 60 / 24 / 365.25).toFixed(0) + 'y ago';
3244
}
3345

3446
export function readableDate(timestamp: string | number): string {

0 commit comments

Comments
 (0)