lib/lita/handlers/kegbot.rb in lita-kegbot-0.1.0 vs lib/lita/handlers/kegbot.rb in lita-kegbot-0.2.0

@@ -60,16 +60,17 @@
         config.api_url = nil
       end
 
       def drink_list_all(response)
         result = api_request('get', 'drinks/')
-        if result && result['result'] && result['result']['drinks']
-          drinks = result['result']['drinks']
+        if result && result['objects']
+          drinks = result['objects']
           response.reply(t('drinks.none')) unless drinks.count > 0
           drinks.each do |drink|
+            session = drink['session']
             response.reply(t('drinks.info', user: drink['user_id'],
-                                            date: drink['pour_time']))
+                                            date: session['start_time']))
           end
         else
           response.reply(t('error.request'))
         end
       end
@@ -93,65 +94,58 @@
         end
       end
 
       def tap_status_all(response)
         result = api_request('get', 'taps/')
-        if result && result['result'] && result['result']['taps']
-          taps = result['result']['taps']
+        if result && result['objects']
+          taps = result['objects']
           response.reply(t('taps.none')) unless taps.count > 0
           taps.each do |tap|
-            pct = format('%3.2f', (tap['keg']['percent_full'] * 100))
-            response.reply(t('taps.info', id: tap['tap']['id'],
-                                          desc: tap['keg']['description'],
-                                          pct: pct))
+            response.reply(t('taps.info', id: tap['id'], name: tap['name']))
           end
         else
           response.reply(t('error.request'))
         end
       end
 
       def tap_status_id(response)
         id = response.matches[0][0].to_i
         result = api_request('get', "taps/#{id}")
-        if result && result['result'] && result['result']['tap']
-          tap = result['result']['tap']
-          keg = result['result']['keg']
-          pct = format('%3.2f', (keg['percent_full'] * 100))
-          response.reply(t('taps.info', id: tap['id'],
-                                        desc: keg['description'],
-                                        pct: pct))
+        if result && result['object']
+          tap = result['object']
+          response.reply(t('taps.info', id: tap['id'], name: tap['name']))
         else
           response.reply(t('error.request'))
         end
       end
 
       def keg_status_all(response)
         result = api_request('get', 'kegs/')
-        if result && result['result'] && result['result']['kegs']
-          kegs = result['result']['kegs']
+        if result && result['objects']
+          kegs = result['objects']
           response.reply(t('kegs.none')) unless kegs.count > 0
           kegs.each do |keg|
-            pct = format('%3.2f', (keg['percent_full'] * 100))
+            keg['status'] ? status = 'offline' : status = 'online'
             response.reply(t('kegs.info', id: keg['id'],
-                                          desc: keg['description'],
-                                          status: keg['status'],
-                                          pct: pct))
+                                          beer: keg['beverage']['name'],
+                                          status: status,
+                                          pct: keg['percent_full']))
           end
         else
           response.reply(t('error.request'))
         end
       end
 
       def keg_status_id(response)
         id = response.matches[0][0].to_i
         result = api_request('get', "kegs/#{id}")
-        if result && result['result'] && result['result']['keg']
-          keg = result['result']['keg']
-          pct = format('%3.2f', (keg['percent_full'] * 100))
+        if result && result['object']
+          keg = result['object']
+          keg['status'] ? status = 'offline' : status = 'online'
           response.reply(t('kegs.info', id: keg['id'],
-                                        desc: keg['description'],
-                                        status: keg['status'],
-                                        pct: pct))
+                                        beer: keg['beverage']['name'],
+                                        status: status,
+                                        pct: keg['percent_full']))
         else
           response.reply(t('error.request'))
         end
       end