summaryrefslogtreecommitdiffstats
path: root/server/lib
diff options
context:
space:
mode:
authorUdo Walter2019-04-16 13:38:37 +0200
committerUdo Walter2019-04-16 13:38:37 +0200
commit7e12e71979fb39dea680f947110d2f4be3ec4a50 (patch)
tree8af972bf93e5552cd7bb91fa9ccece857fa40b3a /server/lib
parent[grouphelper] bugfix (diff)
downloadbas-7e12e71979fb39dea680f947110d2f4be3ec4a50.tar.gz
bas-7e12e71979fb39dea680f947110d2f4be3ec4a50.tar.xz
bas-7e12e71979fb39dea680f947110d2f4be3ec4a50.zip
[eventhelper] bugfix
Diffstat (limited to 'server/lib')
-rw-r--r--server/lib/eventhelper.js16
1 files changed, 4 insertions, 12 deletions
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
}
}