3.36.2

classes/CMarketItem.js

@@ -12,7 +12,7 @@ SteamCommunity.prototype.getMarketItem = function(appid, hashName, currency, cal
 			callback(err);
 			return;
 		}
-		
+
 		var $ = Cheerio.load(body);
 		if($('.market_listing_table_message') && $('.market_listing_table_message').text().trim() == 'There are no listings for this item.') {
 			callback(new Error("There are no listings for this item."));
@@ -35,7 +35,7 @@ function CMarketItem(appid, hashName, community, body, $) {
 	this._hashName = hashName;
 	this._community = community;
 	this._$ = $;
-	
+
 	this._country = "US";
 	var match = body.match(/var g_strCountryCode = "([^"]+)";/);
 	if(match) {
@@ -47,14 +47,14 @@ function CMarketItem(appid, hashName, community, body, $) {
 	if(match) {
 		this._language = match[1];
 	}
-	
+
 	this.commodity = false;
-	var match = body.match(/Market_LoadOrderSpread\(\s*(\d+)\s*\);/);
+	match = body.match(/Market_LoadOrderSpread\(\s*(\d+)\s*\);/);
 	if(match) {
 		this.commodity = true;
 		this.commodityID = parseInt(match[1], 10);
 	}
-	
+
 	this.medianSalePrices = null;
 	match = body.match(/var line1=([^;]+);/);
 	if(match) {
@@ -78,7 +78,8 @@ function CMarketItem(appid, hashName, community, body, $) {
 	if (match) {
 		try {
 			this.assets = JSON.parse(match[1]);
-			this.assets = this.assets['730']['2'];
+			this.assets = this.assets[appid];
+			this.assets = this.assets[Object.keys(this.assets)[0]];
 			this.firstAsset = this.assets[Object.keys(this.assets)[0]];
 		} catch (e) {
 			// ignore
@@ -112,29 +113,29 @@ CMarketItem.prototype.updatePriceForCommodity = function(currency, callback) {
 			callback(err);
 			return;
 		}
-		
+
 		if(body.success != 1) {
 			if(callback) {
 				callback(new Error("Error " + body.success));
 			}
-			
+
 			return;
 		}
-		
+
 		var match = (body.sell_order_summary || '').match(/<span class="market_commodity_orders_header_promote">(\d+)<\/span>/);
 		if(match) {
 			self.quantity = parseInt(match[1], 10);
 		}
-		
+
 		self.buyQuantity = 0;
 		match = (body.buy_order_summary || '').match(/<span class="market_commodity_orders_header_promote">(\d+)<\/span>/);
 		if(match) {
 			self.buyQuantity = parseInt(match[1], 10);
 		}
-		
+
 		self.lowestPrice = parseInt(body.lowest_sell_order, 10);
 		self.highestBuyOrder = parseInt(body.highest_buy_order, 10);
-		
+
 		// TODO: The tables?
 		if(callback) {
 			callback(null);

classes/CMarketSearchResult.js

@@ -3,26 +3,26 @@ var Cheerio = require('cheerio');
 
 SteamCommunity.prototype.marketSearch = function(options, callback) {
 	var qs = {};
-	
+
 	if(typeof options === 'string') {
 		qs.query = options;
 	} else {
 		qs.query = options.query || '';
 		qs.appid = options.appid;
 		qs.search_descriptions = options.searchDescriptions ? 1 : 0;
-		
+
 		if(qs.appid) {
 			for(var i in options) {
 				if(['query', 'appid', 'searchDescriptions'].indexOf(i) != -1) {
 					continue;
 				}
-				
+
 				// This is a tag
 				qs['category_' + qs.appid + '_' + i + '[]'] = 'tag_' + options[i];
 			}
 		}
 	}
-	
+
 	qs.start = 0;
 	qs.count = 100;
 	qs.sort_column = 'price';
@@ -80,10 +80,10 @@ SteamCommunity.prototype.marketSearch = function(options, callback) {
 
 function CMarketSearchResult(row) {
 	var match = row.attr('href').match(/\/market\/listings\/(\d+)\/([^\?\/]+)/);
-	
+
 	this.appid = parseInt(match[1], 10);
 	this.market_hash_name = decodeURIComponent(match[2]);
-	this.image = row.find('.market_listing_item_img').attr('src').match(/^https?:\/\/[^\/]+\/economy\/image\/[^\/]+\//)[0];
+	this.image = ((row.find('.market_listing_item_img').attr('src') || "").match(/^https?:\/\/[^\/]+\/economy\/image\/[^\/]+\//) || [])[0];
 	this.price = parseInt(row.find('.market_listing_their_price .market_table_value span.normal_price').text().replace(/[^\d]+/g, ''), 10);
 	this.quantity = parseInt(row.find('.market_listing_num_listings_qty').text().replace(/[^\d]+/g, ''), 10);
 }

components/profile.js

@@ -1,7 +1,9 @@
-var SteamCommunity = require('../index.js');
-var SteamID = require('steamid');
-var Cheerio = require('cheerio');
-var fs = require('fs');
+const Cheerio = require('cheerio');
+const FS = require('fs');
+const SteamID = require('steamid');
+
+const Helpers = require('./helpers.js');
+const SteamCommunity = require('../index.js');
 
 SteamCommunity.PrivacyState = {
 	"Private": 1,
@@ -10,9 +12,9 @@ SteamCommunity.PrivacyState = {
 };
 
 var CommentPrivacyState = {
-	"1": "commentselfonly",
-	"2": "commentfriendsonly",
-	"3": "commentanyone"
+	"1": 2,         // private
+	"2": 0,         // friends only
+	"3": 1          // anyone
 };
 
 SteamCommunity.prototype.setupProfile = function(callback) {
@@ -148,10 +150,9 @@ SteamCommunity.prototype.editProfile = function(settings, callback) {
 };
 
 SteamCommunity.prototype.profileSettings = function(settings, callback) {
-	var self = this;
-	this._myProfile("edit/settings", null, function(err, response, body) {
-		if(err || response.statusCode != 200) {
-			if(callback) {
+	this._myProfile("edit/settings", null, (err, response, body) => {
+		if (err || response.statusCode != 200) {
+			if (callback) {
 				callback(err || new Error("HTTP error " + response.statusCode));
 			}
 
@@ -159,8 +160,8 @@ SteamCommunity.prototype.profileSettings = function(settings, callback) {
 		}
 
 		var $ = Cheerio.load(body);
-		var form = $('#editForm');
-		if(!form) {
+		var existingSettings = $('.ProfileReactRoot[data-privacysettings]').data('privacysettings');
+		if (!existingSettings) {
 			if(callback) {
 				callback(new Error("Malformed response"));
 			}
@@ -168,46 +169,71 @@ SteamCommunity.prototype.profileSettings = function(settings, callback) {
 			return;
 		}
 
-		var values = {};
-		form.serializeArray().forEach(function(item) {
-			values[item.name] = item.value;
-		});
+		// PrivacySettings => {PrivacyProfile, PrivacyInventory, PrivacyInventoryGifts, PrivacyOwnedGames, PrivacyPlaytime}
+		// eCommentPermission
+		var privacy = existingSettings.PrivacySettings;
+		var commentPermission = existingSettings.eCommentPermission;
 
-		for(var i in settings) {
-			if(!settings.hasOwnProperty(i)) {
+		for (var i in settings) {
+			if (!settings.hasOwnProperty(i)) {
 				continue;
 			}
 
-			switch(i) {
+			switch (i) {
 				case 'profile':
-					values.privacySetting = settings[i];
+					privacy.PrivacyProfile = settings[i];
 					break;
 
 				case 'comments':
-					values.commentSetting = CommentPrivacyState[settings[i]];
+					commentPermission = CommentPrivacyState[settings[i]];
 					break;
 
 				case 'inventory':
-					values.inventoryPrivacySetting = settings[i];
+					privacy.PrivacyInventory = settings[i];
 					break;
 
 				case 'inventoryGifts':
-					values.inventoryGiftPrivacy = settings[i] ? 1 : 0;
+					privacy.PrivacyInventoryGifts = settings[i] ? SteamCommunity.PrivacyState.Private : SteamCommunity.PrivacyState.Public;
+					break;
+
+				case 'gameDetails':
+					privacy.PrivacyOwnedGames = settings[i];
+					break;
+
+				case 'playtime':
+					privacy.PrivacyPlaytime = settings[i] ? SteamCommunity.PrivacyState.Private : SteamCommunity.PrivacyState.Public;
 					break;
 			}
 		}
 
-		self._myProfile("edit/settings", values, function(err, response, body) {
-			if(err || response.statusCode != 200) {
-				if(callback) {
+		this._myProfile({
+			"method": "POST",
+			"endpoint": "ajaxsetprivacy/",
+			"json": true,
+			"formData": { // it's multipart because lolvalve
+				"sessionid": this.getSessionID(),
+				"Privacy": JSON.stringify(privacy),
+				"eCommentPermission": commentPermission
+			}
+		}, null, function(err, response, body) {
+			if (err || response.statusCode != 200) {
+				if (callback) {
 					callback(err || new Error("HTTP error " + response.statusCode));
 				}
 
 				return;
 			}
 
-			if(callback) {
-				callback(null);
+			if (body.success != 1) {
+				if (callback) {
+					callback(new Error(body.success ? "Error " + body.success : "Request was not successful"));
+				}
+
+				return;
+			}
+
+			if (callback) {
+				callback(null, body.Privacy);
 			}
 		});
 	});
@@ -256,7 +282,7 @@ SteamCommunity.prototype.uploadAvatar = function(image, format, callback) {
 			}
 		}
 
-		fs.readFile(image, function(err, file) {
+		FS.readFile(image, function(err, file) {
 			if(err) {
 				if(callback) {
 					callback(err);

index.js

@@ -1,9 +1,9 @@
 require('@doctormckay/stats-reporter').setup(require('./package.json'));
 
-var Request = require('request');
-var RSA = require('node-bignumber').Key;
-var hex2b64 = require('node-bignumber').hex2b64;
-var SteamID = require('steamid');
+const hex2b64 = require('node-bignumber').hex2b64;
+const Request = require('request');
+const RSA = require('node-bignumber').Key;
+const SteamID = require('steamid');
 
 const USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36";
 
@@ -460,11 +460,13 @@ SteamCommunity.prototype._myProfile = function(endpoint, form, callback) {
 	function completeRequest(url) {
 		var options = endpoint.endpoint ? endpoint : {};
 		options.uri = "https://steamcommunity.com" + url + "/" + (endpoint.endpoint || endpoint);
-		options.method = "GET";
 
 		if (form) {
 			options.method = "POST";
 			options.form = form;
+			options.followAllRedirects = true;
+		} else if (!options.method) {
+			options.method = "GET";
 		}
 
 		self.httpRequest(options, callback, "steamcommunity");

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "steamcommunity",
-	"version": "3.35.1",
+	"version": "3.36.2",
 	"description": "Provides an interface for logging into and interacting with the Steam Community website",
 	"keywords": [
 		"steam",
@@ -22,7 +22,7 @@
 	},
 	"dependencies": {
 		"@doctormckay/stats-reporter": "^1.0.2",
-		"request": "^2.81.0",
+		"request": "^2.86.0",
 		"node-bignumber": "^1.2.1",
 		"steamid": "^1.0.0",
 		"xml2js": "^0.4.11",