github-repos/node-steamcommunity
1
0
Fork 0
mirror of https://github.com/DoctorMcKay/node-steamcommunity.git synced 2024-12-27 15:10:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed now-unnecessary _checkHttpError and _checkCommunityError calls

Browse Source
This commit is contained in:
Alexander Corn 2016-03-04 23:59:49 -05:00
parent fce2560abe
commit 1032b1f832
12 changed files with 74 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/CMarketItem.js
View File

@ -8,7 +8,8 @@ SteamCommunity.prototype.getMarketItem = function(appid, hashName, currency, cal
}
var self = this;
this.httpRequest("https://steamcommunity.com/market/listings/" + appid + "/" + encodeURIComponent(hashName), function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -107,7 +108,8 @@ CMarketItem.prototype.updatePriceForCommodity = function(currency, callback) {
"uri": "https://steamcommunity.com/market/itemordershistogram?country=US&language=english&currency=" + currency + "&item_nameid=" + this.commodityID,
"json": true
}, function(err, response, body) {
if(self._community._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -153,7 +155,8 @@ CMarketItem.prototype.updatePriceForNonCommodity = function (currency, callback)
"/render/?query=&start=0&count=10&country=US&language=english&currency=" + currency,
"json": true
}, function(err, response, body) {
if (self._community._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}

3
classes/CMarketSearchResult.js
View File

@ -40,7 +40,8 @@ function performSearch(request, qs, results, callback) {
},
"json": true
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}

7
classes/CSteamGroup.js
View File

@ -13,11 +13,8 @@ SteamCommunity.prototype.getSteamGroup = function(id, callback) {
var self = this;
this.httpRequest("https://steamcommunity.com/" + (typeof id === 'string' ? "groups/" + id : "gid/" + id.toString()) + "/memberslistxml/?xml=1", function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
if (err) {
callback(err);
return;
}

7
classes/CSteamUser.js
View File

@ -13,11 +13,8 @@ SteamCommunity.prototype.getSteamUser = function(id, callback) {
var self = this;
this.httpRequest("http://steamcommunity.com/" + (typeof id === 'string' ? "id/" + id : "profiles/" + id.toString()) + "/?xml=1", function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
if (err) {
callback(err);
return;
}

3
components/chat.js
View File

@ -118,7 +118,8 @@ SteamCommunity.prototype.chatMessage = function(recipient, text, type, callback)
return;
}
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}

3
components/confirmations.js
View File

@ -153,7 +153,8 @@ function request(community, url, key, time, tag, params, json, callback) {
"qs": params,
"json": !!json
}, function(err, response, body) {
if(community._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}

94
components/groups.js
View File

@ -39,7 +39,8 @@ SteamCommunity.prototype.getGroupMembers = function(gid, callback, members, link
var self = this;
this.httpRequest(options, function(err, response, body) {
if (self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -84,16 +85,7 @@ SteamCommunity.prototype.joinGroup = function(gid, callback) {
return;
}
if(err || response.statusCode >= 400) {
callback(err || new Error("HTTP error " + response.statusCode));
return;
}
if(self._checkCommunityError(body, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -112,16 +104,7 @@ SteamCommunity.prototype.leaveGroup = function(gid, callback) {
return;
}
if(err || response.statusCode >= 400) {
callback(err || new Error("HTTP error " + response.statusCode));
return;
}
if(self._checkCommunityError(body, callback)) {
return;
}
callback(null);
callback(err || null);
});
};
@ -139,12 +122,8 @@ SteamCommunity.prototype.getAllGroupAnnouncements = function(gid, time, callback
this.httpRequest({
"uri": "https://steamcommunity.com/gid/" + gid.getSteamID64() + "/rss/"
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
if (err) {
callback(err);
return;
}
@ -196,15 +175,7 @@ SteamCommunity.prototype.postGroupAnnouncement = function(gid, headline, content
return;
}
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -227,22 +198,14 @@ SteamCommunity.prototype.editGroupAnnouncement = function(gid, aid, headline, co
"languages[0][body]": content,
"languages[0][updated]": 1
}
}
};
this.httpRequestPost(submitData, function(err, response, body) {
if(!callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -262,15 +225,7 @@ SteamCommunity.prototype.deleteGroupAnnouncement = function(gid, aid, callback)
return;
}
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -327,16 +282,7 @@ SteamCommunity.prototype.scheduleGroupEvent = function(gid, name, type, descript
return;
}
if(err || response.statusCode >= 400) {
callback(err || new Error("HTTP error " + response.statusCode));
return;
}
if(self._checkCommunityError(body, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -406,16 +352,7 @@ SteamCommunity.prototype.kickGroupMember = function(gid, steamID, callback) {
return;
}
if(err || response.statusCode >= 400) {
callback(err || new Error("HTTP error " + response.statusCode));
return;
}
if(self._checkCommunityError(body, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -431,11 +368,8 @@ SteamCommunity.prototype.getGroupHistory = function(gid, page, callback) {
var self = this;
this.httpRequest("https://steamcommunity.com/gid/" + gid.getSteamID64() + "/history?p=" + page, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
if (err) {
callback(err);
return;
}

4
components/market.js
View File

@ -4,9 +4,11 @@ var Cheerio = require('cheerio');
SteamCommunity.prototype.getMarketApps = function(callback) {
var self = this;
this.httpRequest('https://steamcommunity.com/market/', function (err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
var $ = Cheerio.load(body);
if ($('.market_search_game_button_group')) {
apps = {};

9
components/twofactor.js
View File

@ -28,7 +28,8 @@ SteamCommunity.prototype.enableTwoFactor = function(callback) {
},
"json": true
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -77,7 +78,8 @@ SteamCommunity.prototype.finalizeTwoFactor = function(secret, activationCode, ca
},
"json": true
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -127,7 +129,8 @@ SteamCommunity.prototype.disableTwoFactor = function(revocationCode, callback) {
},
"json": true
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}

33
components/users.js
View File

@ -21,7 +21,8 @@ SteamCommunity.prototype.addFriend = function(userID, callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -51,11 +52,7 @@ SteamCommunity.prototype.acceptFriendRequest = function(userID, callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -76,11 +73,7 @@ SteamCommunity.prototype.removeFriend = function(userID, callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -101,11 +94,7 @@ SteamCommunity.prototype.blockCommunication = function(userID, callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};
@ -150,7 +139,8 @@ SteamCommunity.prototype.postUserComment = function(userID, message, callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -185,7 +175,8 @@ SteamCommunity.prototype.inviteUserToGroup = function(userID, groupID, callback)
return;
}
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -216,7 +207,8 @@ SteamCommunity.prototype.getUserInventoryContexts = function(userID, callback) {
var self = this;
this.httpRequest("https://steamcommunity.com/profiles/" + userID.getSteamID64() + "/inventory/", function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -257,7 +249,8 @@ SteamCommunity.prototype.getUserInventory = function(userID, appID, contextID, t
},
"json": true
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}

13
components/webapi.js
View File

@ -6,7 +6,8 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
"uri": "https://steamcommunity.com/dev/apikey",
"followRedirect": false
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -28,7 +29,8 @@ SteamCommunity.prototype.getWebApiKey = function(domain, callback) {
"Submit": "Register"
}
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -47,11 +49,8 @@ SteamCommunity.prototype.getWebApiOauthToken = function(callback) {
// Pull an oauth token from the webchat UI
this.httpRequest("https://steamcommunity.com/chat", function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
return;
}
if(self._checkCommunityError(body, callback)) {
if (err) {
callback(err);
return;
}

29
index.js
View File

@ -74,8 +74,9 @@ SteamCommunity.prototype.login = function(details, callback) {
"json": true
}, function(err, response, body) {
// Remove the mobile cookies
if (self._checkHttpError(err, response, callback)) {
if (err) {
deleteMobileCookies();
callback(err);
return;
}
@ -110,7 +111,8 @@ SteamCommunity.prototype.login = function(details, callback) {
}, function(err, response, body) {
deleteMobileCookies();
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -183,7 +185,8 @@ SteamCommunity.prototype.oAuthLogin = function(steamguard, token, callback) {
},
"json": true
}, function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -247,16 +250,19 @@ SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
if(!body || typeof body.success !== 'boolean') {
return callback("Invalid response");
callback("Invalid response");
return;
}
if(!body.success) {
return callback("Incorrect PIN");
callback("Incorrect PIN");
return;
}
callback();
@ -266,7 +272,8 @@ SteamCommunity.prototype.parentalUnlock = function(pin, callback) {
SteamCommunity.prototype.getNotifications = function(callback) {
var self = this;
this.httpRequestGet("https://steamcommunity.com/actions/RefreshNotificationArea", function(err, response, body) {
if(self._checkHttpError(err, response, callback)) {
if (err) {
callback(err);
return;
}
@ -305,12 +312,8 @@ SteamCommunity.prototype.resetItemNotifications = function(callback) {
if(!callback) {
return;
}
if(self._checkHttpError(err, response, callback)) {
return;
}
callback(null);
callback(err || null);
}, "steamcommunity");
};