Finishing up GetPlayerItem addresses #49

Author: stygiansabyss

src/Syntax/SteamApi/Containers/Item.php

@@ -4,58 +4,53 @@
 
 class Item extends BaseContainer
 {
-    public $appId;
+    public $id;
 
-    public $name;
+    public $originalId;
 
-    public $playtimeTwoWeeks;
+    public $defIndex;
 
-    public $playtimeTwoWeeksReadable;
+    public $level;
 
-    public $playtimeForever;
+    public $quality;
 
-    public $playtimeForeverReadable;
+    public $quantity;
 
-    public $icon;
+    public $inventory;
 
-    public $logo;
+    public $origin;
 
-    public $header;
+    public $flags;
 
-    public $hasCommunityVisibleStats;
+    public $containedItem;
 
-    public function __construct($app)
-    {
-        $this->appId                    = $app->appid;
-        $this->name                     = $this->checkIssetField($app, 'name');
-        $this->playtimeTwoWeeks         = $this->checkIssetField($app, 'playtime_2weeks', 0);
-        $this->playtimeTwoWeeksReadable = $this->convertFromMinutes($this->playtimeTwoWeeks);
-        $this->playtimeForever          = $this->checkIssetField($app, 'playtime_forever', 0);
-        $this->playtimeForeverReadable  = $this->convertFromMinutes($this->playtimeForever);
-        $this->icon                     = $this->checkIssetImage($app, 'img_icon_url');
-        $this->logo                     = $this->checkIssetImage($app, 'img_logo_url');
-        $this->header                   = 'http://cdn.steampowered.com/v/gfx/apps/' . $this->appId . '/header.jpg';
-        $this->hasCommunityVisibleStats = $this->checkIssetField($app, 'has_community_visible_stats', 0);
-    }
+    public $style;
 
-    /**
-     * @param        $app
-     * @param string $field
-     * @param string $value
-     *
-     * @return null|string
-     */
-    protected function checkIssetImage($app, $field, $value = null)
-    {
-        return isset($app->$field) ? $this->getImageForGame($app->appid, $app->$field) : $value;
-    }
+    public $attributes;
 
-    protected function getImageForGame($appId, $hash)
-    {
-        if ($hash != null) {
-            return 'http://media.steampowered.com/steamcommunity/public/images/apps/' . $appId . '/' . $hash . '.jpg';
-        }
+    public $custom;
 
-        return null;
+    public function __construct($item)
+    {
+        $this->id            = $item->id;
+        $this->originalId    = $item->original_id;
+        $this->defIndex      = $item->defindex;
+        $this->level         = $item->level;
+        $this->quality       = $item->quality;
+        $this->quantity      = $item->quantity;
+        $this->inventory     = $item->inventory;
+        $this->origin        = $this->checkIssetField($item, 'origin');
+        $this->containedItem = $this->checkIssetField($item, 'contained_item');
+        $this->style         = $this->checkIssetField($item, 'style');
+        $this->attributes    = $this->checkIssetField($item, 'attributes');
+
+        $this->flags  = [
+            'trade' => (boolean)! $this->checkIssetField($item, 'flag_cannot_trade', false),
+            'craft' => (boolean)! $this->checkIssetField($item, 'flag_cannot_craft', false),
+        ];
+        $this->custom = [
+            'name'        => $this->checkIssetField($item, 'custom_name'),
+            'description' => $this->checkIssetField($item, 'custom_desc'),
+        ];
     }
 }

src/Syntax/SteamApi/Inventory.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Syntax\SteamApi;
+
+class Inventory
+{
+    public $numberOfBackpackSlots;
+
+    public $items;
+
+    public function __construct($slots, $items)
+    {
+        $this->numberOfBackpackSlots = $slots;
+        $this->items                 = $items;
+    }
+}

src/Syntax/SteamApi/Steam/Item.php

@@ -5,6 +5,8 @@
 use Syntax\SteamApi\Client;
 use NukaCode\Database\Collection;
 use Syntax\SteamApi\Containers\Item as ItemContainer;
+use Syntax\SteamApi\Exceptions\ApiCallFailedException;
+use Syntax\SteamApi\Inventory;
 
 class Item extends Client
 {
@@ -26,38 +28,37 @@ public function GetPlayerItems($appId, $steamId)
 
         $arguments = ['steamId' => $steamId];
 
-        // Get the client
-        $client = $this->setUpClient($arguments);
-        dd($client);
+        try {
+            // Get the client
+            $client = $this->setUpClient($arguments);
+        } catch (ApiCallFailedException $exception) {
+            // No items exist for this game.
+            return null;
+        }
 
         // Clean up the items
-        $items = $this->convertToObjects($client->result->items, $client->result->qualities);
+        $items = $this->convertToObjects($client->result->items);
 
-        return $items;
+        // Return a full inventory
+        return new Inventory($client->result->num_backpack_slots, $items);
     }
 
-    protected function convertToObjects($items, $qualities)
+    protected function convertToObjects($items)
     {
-        $convertedItems = $this->convertGames($items, $qualities);
-
-        $items = $this->sortObjects($convertedItems);
-
-        return $items;
+        return $this->convertItems($items);
     }
 
     /**
      * @param array $items
      *
      * @return Collection
      */
-    protected function convertItems($items, $qualities)
+    protected function convertItems($items)
     {
         $convertedItems = new Collection();
 
         foreach ($items as $item) {
-            if (isset($item->data)) {
-                $convertedItems->add(new ItemContainer($item->data, $qualities));
-            }
+            $convertedItems->add(new ItemContainer($item));
         }
 
         return $convertedItems;