From 7e12e71979fb39dea680f947110d2f4be3ec4a50 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Tue, 16 Apr 2019 11:38:37 +0000 Subject: [eventhelper] bugfix --- server/lib/eventhelper.js | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'server/lib') diff --git a/server/lib/eventhelper.js b/server/lib/eventhelper.js index 557d89f..fb359e9 100644 --- a/server/lib/eventhelper.js +++ b/server/lib/eventhelper.js @@ -4,20 +4,12 @@ const later = require('later') function isActive (eventData) { - const startDate = new Date(eventData.startDate * 1000) - const endDate = new Date(eventData.endDate * 1000) - let now = new Date() + const now = Date.now() / 1000 if (eventData.repetitive) { - if (startDate < now && now < endDate) return false - return later.schedule(getTimeSpans(eventData)).isValid(now) + if (now < eventData.startDate || eventData.endDate < now) return false + return later.schedule(getTimeSpans(eventData)).isValid(new Date(now * 1000)) } else { - const startTime = eventData.startTime.split(':') - startDate.setHours(startTime[0]) - startDate.setMinutes(startTime[1]) - const endTime = eventData.endTime.split(':') - endDate.setHours(endTime[0]) - endDate.setMinutes(endTime[1]) - return startDate < now && now < endDate + return eventData.start < now && now < eventData.end } } -- cgit v1.2.3-55-g7522