From 9232902f4a09da15bb4085c6494c52020cef9f09 Mon Sep 17 00:00:00 2001 From: Jason Calabrese Date: Wed, 8 Jul 2015 20:23:22 -0700 Subject: [PATCH] when looking for a snooze to cover an alarm, don't worry about alarm state since it wouldn't be updated yet --- lib/notifications.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/notifications.js b/lib/notifications.js index 9c1922e0dd0..18b9ea8b661 100644 --- a/lib/notifications.js +++ b/lib/notifications.js @@ -122,16 +122,9 @@ function init (env, ctx) { var byLevel = _.filter(requests.snoozes, function checkSnooze (snooze) { return snooze.level >= notify.level; }); - var sorted = _.sortBy(byLevel, 'mills'); - var longest = _.last(sorted); + var sorted = _.sortBy(byLevel, 'lengthMills'); - var alarm = getAlarm(notify.level); - - if (longest && Date.now() + longest.lengthMills > alarm.lastAckTime + alarm.silenceTime) { - return longest; - } else { - return null; - } + return _.last(sorted); }; notifications.requestNotify = function requestNotify (notify) {