Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Display relative timestamp for threads on the same calendar day #10399

Merged
merged 4 commits into from
Mar 27, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/DateUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ function withinPast24Hours(prevDate: Date, nextDate: Date): boolean {
return Math.abs(prevDate.getTime() - nextDate.getTime()) <= MILLIS_IN_DAY;
}

function withinCurrentDay(prevDate: Date, nextDate: Date): boolean {
return withinPast24Hours(prevDate, nextDate) && prevDate.getDay() === nextDate.getDay();
}

function withinCurrentYear(prevDate: Date, nextDate: Date): boolean {
return prevDate.getFullYear() === nextDate.getFullYear();
}
Expand Down Expand Up @@ -214,7 +218,7 @@ export function formatFullDateNoDayNoTime(date: Date): string {

export function formatRelativeTime(date: Date, showTwelveHour = false): string {
const now = new Date(Date.now());
if (withinPast24Hours(date, now)) {
if (withinCurrentDay(date, now)) {
return formatTime(date, showTwelveHour);
} else {
const months = getMonthsArray();
Expand Down
9 changes: 8 additions & 1 deletion test/utils/DateUtils-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,18 @@ describe("formatRelativeTime", () => {
dateSpy.mockRestore();
});

it("returns hour format for events created less than 24 hours ago", () => {
it("returns hour format for events created in the same day", () => {
// Tuesday, 2 November 2021 11:01:00 UTC
const date = new Date(2021, 10, 2, 11, 1, 23, 0);
expect(formatRelativeTime(date)).toBe("11:01");
});

it("returns month and day for events created less than 24h ago but on a different day", () => {
// Monday, 1 November 2021 23:01:00 UTC
const date = new Date(2021, 10, 1, 23, 1, 23, 0);
expect(formatRelativeTime(date)).toBe("Nov 1");
});

it("honours the hour format setting", () => {
const date = new Date(2021, 10, 2, 11, 1, 23, 0);
expect(formatRelativeTime(date)).toBe("11:01");
Expand Down