lib/bender/main.rb in bender-bot-0.5.4 vs lib/bender/main.rb in bender-bot-0.5.5

@@ -182,10 +182,18 @@
 
     def set_room_name_and_topic room_id, incidents, hipchat, bot
       room = hipchat[room_id]
       new_room = room.get_room
 
+      if incidents.nil?
+        log.error \
+          error: 'Cannot set room name and topic',
+          reason: 'incidents are nil',
+          room_id: room_id
+        return
+      end
+
       open_incidents = incidents.select do |i|
         status    = normalize_value i['fields']['status']
         severity  = short_severity(i['fields'][SEVERITY_FIELD]['value'])
         is_open   = !(status =~ /resolved|closed/i)
         is_severe = severity =~ /(SEV1|SEV2)/i
@@ -309,11 +317,12 @@
             sleep 5
             next
           end
 
           users = data.inject({}) do |h, user|
-            h[user['key']] = {
-              nick: user['key'],
+            h[user['name']] = {
+              key: user['key'],
+              nick: user['name'],
               name: user['displayName'],
               email: user['emailAddress']
             } ; h
           end