fix #348 - consumables item data parse

futapi · Dec 1, 2017 · 45b16f2 · 45b16f2
1 parent cd32d92
commit 45b16f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,13 @@ Changelog
 ---------
 
 
+0.3.7 (2017-12-01)
+^^^^^^^^^^^^^^^^^^
+
+* allow init with None cookies (fix #345 by kirov)
+* fix clubConsumables (#347, #348)
+* remove path value check in remoteConfig
+
 0.3.6 (2017-11-12)
 ^^^^^^^^^^^^^^^^^^
 

diff --git a/fut/core.py b/fut/core.py
@@ -77,14 +77,16 @@ def itemParse(item_data, full=True):
         'tradeState':        item_data.get('tradeState'),
         'bidState':          item_data.get('bidState'),
         'startingBid':       item_data.get('startingBid'),
-        'id':                item_data.get('itemData', {'id': None})['id'],
+        'id':                item_data.get('itemData', {'id': None})['id'] or item_data.get('item', {'id': None})['id'],
         'offers':            item_data.get('offers'),
         'currentBid':        item_data.get('currentBid'),
         'expires':           item_data.get('expires'),  # seconds left
         'sellerEstablished': item_data.get('sellerEstablished'),
         'sellerId':          item_data.get('sellerId'),
         'sellerName':        item_data.get('sellerName'),
         'watched':           item_data.get('watched'),
+        'resourceId':        item_data.get('resourceId'),  # consumables only?
+        'discardValue':      item_data.get('discardValue'),  # consumables only?
     }
     if full:
         if 'itemData' in item_data: