summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/api/wakerequests.js2
-rw-r--r--server/lib/eventhelper.js16
-rw-r--r--server/lib/grouphelper.js2
3 files changed, 6 insertions, 14 deletions
diff --git a/server/api/wakerequests.js b/server/api/wakerequests.js
index e14501c..37670d4 100644
--- a/server/api/wakerequests.js
+++ b/server/api/wakerequests.js
@@ -9,7 +9,7 @@ var router = decorateApp(express.Router())
router.postAsync('', async (req, res) => {
const clients = await db.client.findAll({ where: { id: req.body.clients } })
clients.forEach(client => {
- wol.wake(client.mac, { address: client.ip.slice(0, client.ip.lastIndexOf('.') + 1) + '255' }, err => console.log(err))
+ wol.wake(client.mac, { address: client.ip.slice(0, client.ip.lastIndexOf('.') + 1) + '255' }, err => { if (err) console.log(err) })
})
res.status(200).end()
})
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
}
}
diff --git a/server/lib/grouphelper.js b/server/lib/grouphelper.js
index edbd980..117dd79 100644
--- a/server/lib/grouphelper.js
+++ b/server/lib/grouphelper.js
@@ -7,7 +7,7 @@ async function getAllChildren (groups, groupBlacklist, clientBlacklist) {
const knownClientMap = {}
if (groupBlacklist) groupBlacklist.forEach(group => { knownGroupMap[group.id] = true })
if (clientBlacklist) clientBlacklist.forEach(client => { knownClientMap[client.id] = true })
- return getAllChildrenByIds(groups.map(x => x.id), groupBlacklist, clientBlacklist)
+ return getAllChildrenByIds(groups.map(x => x.id), knownGroupMap, knownClientMap)
}
async function getAllChildrenByIds (groupIds, knownGroupMap, knownClientMap) {