From b2d83cc1124b7e995509836620e4d5e221f5d9bf Mon Sep 17 00:00:00 2001
From: Stephen Yeargin <stephen.yeargin@gmail.com>
Date: Tue, 27 Nov 2018 14:20:40 -0600
Subject: [PATCH] Fix where no oncall returned if missing configuration
 variable

Introduced in #117. Also fixes case where an ignored schedule would still appear in the logs if no username was assigned to it.

Fixes #118
---
 src/scripts/pagerduty.coffee | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/scripts/pagerduty.coffee b/src/scripts/pagerduty.coffee
index 44bb20ef..e8228ef9 100644
--- a/src/scripts/pagerduty.coffee
+++ b/src/scripts/pagerduty.coffee
@@ -614,11 +614,18 @@ module.exports = (robot) ->
 
     renderSchedule = (s, cb) ->
       withCurrentOncall msg, s, (username, schedule) ->
+        # If there is an allowed schedules array, skip returned schedule not in it
+        if allowed_schedules.length and schedule.id not in allowed_schedules
+          robot.logger.debug "Schedule #{schedule.id} (#{schedule.name}) not in HUBOT_PAGERDUTY_SCHEDULES"
+          return cb null
+
+        # Ignore schedule if no user assigned to it 
         if (username)
-          if !allowed_schedules or schedule.id in allowed_schedules
-            messages.push("* #{username} is on call for #{schedule.name} - #{schedule.html_url}")
+          messages.push("* #{username} is on call for #{schedule.name} - #{schedule.html_url}")
         else
           robot.logger.debug "No user for schedule #{schedule.name}"
+
+        # Return callback
         cb null
 
     if scheduleName?