From 9d43583b473d72aad1ce0912ec8c42204f99db89 Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Wed, 9 Aug 2023 10:38:49 -0700 Subject: enh: set later today to 6pm Signed-off-by: Christopher Ng --- apps/files_reminders/src/shared/utils.ts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'apps/files_reminders/src/shared/utils.ts') diff --git a/apps/files_reminders/src/shared/utils.ts b/apps/files_reminders/src/shared/utils.ts index 5d223fe657d..453e94e76d9 100644 --- a/apps/files_reminders/src/shared/utils.ts +++ b/apps/files_reminders/src/shared/utils.ts @@ -30,14 +30,17 @@ export enum DateTimePreset { NextWeek, } -export const getDateTime = (dateTime: DateTimePreset): Date => { - const matchPreset: Record Date> = { +export const getDateTime = (dateTime: DateTimePreset): null | Date => { + const matchPreset: Record null | Date> = { [DateTimePreset.LaterToday]: () => { - const hour = moment().get('hour') - const later = moment() + const now = moment() + const evening = moment() .startOf('day') - .add(hour + 3, 'hour') - return later.toDate() + .add(18, 'hour') + if (now.isSameOrAfter(evening)) { + return null + } + return evening.toDate() }, [DateTimePreset.Tomorrow]: () => { @@ -45,8 +48,7 @@ export const getDateTime = (dateTime: DateTimePreset): Date => { .add(1, 'day') .startOf('day') .add(8, 'hour') - .toDate() - return day + return day.toDate() }, [DateTimePreset.ThisWeekend]: () => { @@ -80,8 +82,7 @@ export const getDateTime = (dateTime: DateTimePreset): Date => { .startOf('isoWeek') .add(1, 'week') .add(8, 'hour') - .toDate() - return day + return day.toDate() }, } -- cgit v1.2.3