From b789e13a7030f8581e7901d6baba5e6cf63b7be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Silva?= <joao.boy.silva03@gmail.com>
Date: Tue, 13 Dec 2016 05:23:02 +0000
Subject: [PATCH] Update inventory loading endpoint (#148)

* Update inventory loading endpoint

Should fix 429s :)

* Fix missing contextID parameter at CEconItem class

* Revert "Fix missing contextID parameter at CEconItem class"

This reverts commit 416321105be64286eb023d4f84691baf0cc59f9a.

* Revert "Revert "Fix missing contextID parameter at CEconItem class""

This reverts commit 49ecd469543b7d7283154f40b7cc13ae95372cb4.

* Update #1
---
 classes/CEconItem.js |  9 +++----
 components/users.js  | 58 +++++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/classes/CEconItem.js b/classes/CEconItem.js
index 1c2f288..3efb516 100644
--- a/classes/CEconItem.js
+++ b/classes/CEconItem.js
@@ -15,12 +15,9 @@ function CEconItem(item, descriptions, contextID) {
 
 	// Merge the description
 	if(descriptions) {
-		var description = descriptions[this.classid + '_' + this.instanceid];
-		if(description) {
-			for(thing in description) {
-				if(description.hasOwnProperty(thing)) {
-					this[thing] = description[thing];
-				}
+		for(thing in descriptions) {
+			if(descriptions.hasOwnProperty(thing)) {
+				this[thing] = descriptions[thing];
 			}
 		}
 	}
diff --git a/components/users.js b/components/users.js
index 4cdd026..8ea7630 100644
--- a/components/users.js
+++ b/components/users.js
@@ -263,16 +263,16 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
 	if(typeof userID === 'string') {
 		userID = new SteamID(userID);
 	}
+	
+	get([], [], 1);
 
-	var endpoint = "/profiles/" + userID.getSteamID64();
-	get([], []);
-
-	function get(inventory, currency, start) {
+	function get(inventory, currency, step, start) {
 		self.httpRequest({
-			"uri": "https://steamcommunity.com" + endpoint + "/inventory/json/" + appID + "/" + contextID,
+			"uri": "https://steamcommunity.com/inventory/" + userID.getSteamID64() + "/" + appID + "/" + contextID,
 			"qs": {
-				"start": start,
-				"trading": tradableOnly ? 1 : undefined
+				"l": "english", // Default language
+				"count": 5000, // Max items per 'page'
+				"start_assetid": start,
 			},
 			"json": true
 		}, function(err, response, body) {
@@ -281,9 +281,9 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
 				return;
 			}
 
-			if(!body || !body.success || !body.rgInventory || !body.rgDescriptions || !body.rgCurrency) {
+			if(!body || !body.success || !body.assets || !body.descriptions) {
 				if(body) {
-					callback(new Error(body.Error || "Malformed response"));
+					callback(new Error(body.error || "Malformed response"));
 				} else {
 					callback(new Error("Malformed response"));
 				}
@@ -291,33 +291,31 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
 				return;
 			}
 
-			var i;
-			for(i in body.rgInventory) {
-				if(!body.rgInventory.hasOwnProperty(i)) {
-					continue;
+			for(var i = 0; i < body.assets.length; i++) {
+				var description = getDescription(body.descriptions, body.assets[i].classid, body.assets[i].instanceid)
+				
+				if(!tradableOnly || description && description.tradable) {
+					inventory.push(new CEconItem(body.assets[i], description, contextID));
 				}
-
-				inventory.push(new CEconItem(body.rgInventory[i], body.rgDescriptions, contextID));
 			}
+			
+			// Dunno how to handle currencies now
 
-			for(i in body.rgCurrency) {
-				if(!body.rgCurrency.hasOwnProperty(i)) {
-					continue;
-				}
-
-				currency.push(new CEconItem(body.rgInventory[i], body.rgDescriptions, contextID));
-			}
-
-			if(body.more) {
-				var match = response.request.uri.href.match(/\/(profiles|id)\/([^\/]+)\//);
-				if(match) {
-					endpoint = "/" + match[1] + "/" + match[2];
-				}
-
-				get(inventory, currency, body.more_start);
+			if(body.total_inventory_count > 5000 * step) {
+				get(inventory, currency, step + 1, body.assets[body.assets.length - 1].assetid);
 			} else {
 				callback(null, inventory, currency);
 			}
 		}, "steamcommunity");
 	}
 };
+
+function getDescription(descriptions, classID, instanceID) {
+	for(var i = 0; i < descriptions.length; i++) {
+		if(descriptions[i].classid == classID && descriptions[i].instanceid == instanceID) {
+			return descriptions[i];
+		}
+	}
+	
+	return;
+}