lita-destiny 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1001acb2f432e2829d2350b9b135e21ed25e15cb
-  data.tar.gz: 408334e7ac7d4c16764329f7eedbb0a68e24b231
+  metadata.gz: 4ea830396e445d516960ab39d3814072db20ff09
+  data.tar.gz: 3672eea695235e4e1bfb5e09efbf6f89c6298118
 SHA512:
-  metadata.gz: b891fde418eace9f3d39800c42f9d0e5c6a3bf9eabf2013adc3387e19c4a46d82a0431326a150158aa0e67c56d791d269c250cd56c7b63be129ed853d2839eb6
-  data.tar.gz: a492befaf6f8be623437c46105001f3abe2c57f9a361b9c2af74e11926c4e8056426bd38f32b845a3898c3bccff3e708498ab4ed9ff0f1203be0a4d9520c6097
+  metadata.gz: 55ea8d63db94359252f2a77ce88465b80546d5497ef1859d974e63ef13bff7eabe6ad2f8cb015e47ae7ebd1001fea0869af3269091f8c86fa0b70bb57bb5f32d
+  data.tar.gz: b63ea11f2e98dfc4e6f09652d1285ab1b6da82390c31f290fbb0d75d7f04fac21bbe23738b47fc87812ecca70fe9eb115465e4a1bd431a5423368f167651a4cc

data/lib/destiny/base_api.rb

@@ -1,5 +1,5 @@
 require 'httparty'
-
+require 'pp'
 # DestinyAPI module wrapper
 module DestinyAPI
   # Base API Class
@@ -13,7 +13,7 @@ module DestinyAPI
     # Auto-parse responses from Bungie as JSON
     format :json
     # Set base uri
-    base_uri 'www.bungie.net/platform/destiny/'
+    base_uri 'www.bungie.net/Platform/Destiny/'
 
 
     # Init the Destiny API with Bungie API stored in ENV variable
@@ -34,7 +34,7 @@ module DestinyAPI
     #   destiny.advisors
     # 
     def advisors
-      raw_data = self.class.get('/advisors', headers: @headers)
+      raw_data = self.class.get('/Advisors', headers: @headers)
       parsed = raw_data.parsed_response['Response']['data']
     end
 
@@ -50,7 +50,7 @@ module DestinyAPI
     #   raw: (Boolean)
     #   
     def activity(activity_hash, raw=false)
-      raw_data = self.class.get("/manifest/activity/#{activity_hash}").parsed_response['Response']['data']['activity']
+      raw_data = self.class.get("/Manifest/Activity/#{activity_hash}").parsed_response['Response']['data']['activity']
       skulls = []
       raw_data['skulls'].each do |skull|
         skulls << skull['displayName']
@@ -98,11 +98,42 @@ module DestinyAPI
     # No known endpoints.
     def arena(options={})
     end
+    
+    def search_destiny_player(player_name, platform_type)
+      raw_data = self.class.get("/SearchDestinyPlayer/#{platform_type}/#{player_name}/").parsed_response['Response']['membershipId']
+    end
+  
+    def get_destiny_account(player_name, platform_type)
+      member_id = self.search_destiny_player(player_name, platform_type)
+      raw_data = self.class.get("/#{platform_type}/Account/#{member_id}/").parsed_response['Response']['data']
+    end
+    
+    def get_manifest_item(type_id, item_id)
+      raw_data = self.class.get("/Manifest/#{type_id}/#{item_id}").parsed_response['Response']['data']['inventoryItem']
+    end
 
     # WIP: Pull xur inventory
-    # http://www.bungie.net/platform/destiny/advisors/xur/?definitions=true
-    def xur
-      raw_data = self.class.get('/advisors/xur/?definitions=true').parsed_response['Response']['definitions']
+    # http://www.bungie.net/platform/destiny/advisors/xur/
+    def xur(raw=false)
+      raw_data = self.class.get('/Advisors/Xur/').parsed_response['Response']['data']
+      vendor_hash = raw_data['vendorHash']
+      sale_items = {}
+      
+      # Hacky? Probs.
+      raw_data['saleItemCategories'].each do |category|
+        items = { category['categoryTitle'] => category['saleItems'].map!{|item| {:item_hash => item['item']['itemHash'], :item_cost => item['costs'][0]['value'], :item_cost_hash => item['costs'][0]['itemHash']} } }
+        sale_items.merge!(items)
+      end
+      
+      if raw
+        raw_data
+      else
+        sale_items
+      end
+    end
+    
+    def vendor(vendor_hash)
+      raw_data = self.class.get("/Manifest/Vendor/#{vendor_hash}").parsed_response['Response']['data']['vendor']['summary']
     end
 
     # Pull the days bounties
@@ -118,7 +149,7 @@ module DestinyAPI
     #  place_hash: (String)
     #  
     def place(place_hash)
-      raw data = self.class.get('/manifest/place/#{place_hash}').parsed_response['Response']['data']['place']
+      raw data = self.class.get('/Manifest/Place/#{place_hash}').parsed_response['Response']['data']['place']
       response = { place_name: raw_data['placeName'], place_desc: raw_data['placeDescription'] }
     end
 
@@ -131,7 +162,7 @@ module DestinyAPI
     #  destination_hash: (String)
     #  
     def destination(destination_hash)
-      raw_data = self.class.get('/manifest/destination/#{destination_hash}').parsed_response['Response']['data']
+      raw_data = self.class.get('/Manifest/Destination/#{destination_hash}').parsed_response['Response']['data']
       response = { dest_name: raw_data['destinationName'], dest_desc: raw_data['destinationDescription'] }
     end
   end

data/lib/lita/handlers/destiny.rb

@@ -73,8 +73,15 @@ module Lita
       def build_activity_message(activity, response)
         # Set activity
         activity_hash = activity
-        # Send response
-        response.reply("#{activity_hash[:activityName]}\n#{activity_hash[:activityDescription]}\nSkulls: #{activity_hash[:skulls].join(', ')}")
+        # Send response based on adapter
+        case robot.config.robot.adapter
+        when :slack
+          # Send response
+          response.reply("*#{activity_hash[:activityName]}*\n#{activity_hash[:activityDescription]}\n*Skulls:* #{activity_hash[:skulls].join(', ')}")
+        else
+          # Send response
+          response.reply("#{activity_hash[:activityName]}\n#{activity_hash[:activityDescription]}\nSkulls: #{activity_hash[:skulls].join(', ')}")
+        end
       end
 
       # Xur Response Method
@@ -86,13 +93,25 @@ module Lita
         destiny_client = DestinyAPI::Base.new(api_key)
         # Set xur to our clients xur method
         xur = destiny_client.xur
+
+        items = []
+        xur.each do |key, value|
+          value.each do |key, value|
+            item_name = destiny_client.get_manifest_item(6, key[:item_hash])['itemName']
+            item_cost = key[:item_cost]
+            item_cost_name = destiny_client.get_manifest_item(6, key[:item_cost_hash])['itemName']
+            constructed_item = "#{item_name}, #{item_cost} #{item_cost_name}"
+            items << constructed_item
+          end
+        end
+        
         # Check vendorDetails to see if anything is availible.
-        if xur[:vendorDetails].nil?
+        if xur.nil?
           # If nothing, send to chat that he isn't there.
-          response.reply "Xur isn't in the tower right now."
+          response.reply "Xur isn't in game right now."
         else
-          # If something, send to chat what he is selling.
-          response.reply "Xur is selling: "
+           #If something, send to chat what he is selling.
+          response.reply "*Xur is selling:*\n#{items.join("\n")}"
         end
       end
     end

data/lita-destiny.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-destiny"
-  spec.version       = "0.1.3"
+  spec.version       = "0.1.4"
   spec.authors       = ["PDaily"]
   spec.email         = ["pat.irwin4@gmail.com"]
   spec.description   = "Small lita.io handler for interacting with the Destiny API"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-destiny
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - PDaily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita