upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

enh(files_reminders): Adjust reminder options

Browse source 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
This commit is contained in:
Christopher Ng 2023-08-10 10:48:17 -07:00
parent a38a86e5c4
commit acd338beba
1 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apps/files_reminders/src/shared/utils.ts
View file

@ -37,7 +37,10 @@ export const getDateTime = (dateTime: DateTimePreset): null | Date => {
const evening = moment()
.startOf('day')
.add(18, 'hour')
if (now.isSameOrAfter(evening)) {
const cutoff = evening
.clone()
.subtract(1, 'hour')
if (now.isSameOrAfter(cutoff)) {
return null
}
return evening.toDate()
@ -53,36 +56,32 @@ export const getDateTime = (dateTime: DateTimePreset): null | Date => {
[DateTimePreset.ThisWeekend]: () => {
const today = moment()
if (
[
5, // Friday
6, // Saturday
7, // Sunday
].includes(today.isoWeekday())
) {
return null
}
const saturday = moment()
.startOf('isoWeek')
.add(5, 'day')
.add(8, 'hour')
const sunday = moment()
.startOf('isoWeek')
.add(6, 'day')
.add(8, 'hour')
if (today.isSame(saturday, 'date')) {
return saturday
.add(1, 'day')
.toDate()
}
if (today.isSame(sunday, 'date')) {
return sunday
.add(1, 'week')
.startOf('isoWeek')
.add(5, 'day')
.add(8, 'hour')
.toDate()
}
return saturday.toDate()
},
[DateTimePreset.NextWeek]: () => {
const day = moment()
const today = moment()
if (today.isoWeekday() === 7) { // Sunday
return null
}
const workday = moment()
.startOf('isoWeek')
.add(1, 'week')
.add(8, 'hour')
return day.toDate()
return workday.toDate()
},
}