diff --git a/lib/accountinformation/getUserSocialLinks.js b/lib/accountinformation/getUserSocialLinks.js index 77f08e4a8..bce82e72a 100644 --- a/lib/accountinformation/getUserSocialLinks.js +++ b/lib/accountinformation/getUserSocialLinks.js @@ -21,7 +21,7 @@ function getUserSocialLinks (userId, jar) { return http({ url: `//accountinformation.roblox.com/v1/users/${userId}/promotion-channels`, options: { - jar: jar, + jar, resolveWithFullResponse: true } }) diff --git a/lib/accountsettings/block.js b/lib/accountsettings/block.js index 2e0e085d8..81e555048 100644 --- a/lib/accountsettings/block.js +++ b/lib/accountsettings/block.js @@ -25,7 +25,7 @@ function block (jar, token, userId) { url: `//accountsettings.roblox.com/v1/users/${userId}/block`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -51,7 +51,7 @@ function block (jar, token, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return block(jar, xcsrf, args.userId) }) diff --git a/lib/accountsettings/unblock.js b/lib/accountsettings/unblock.js index 7265226c2..2619e0449 100644 --- a/lib/accountsettings/unblock.js +++ b/lib/accountsettings/unblock.js @@ -25,7 +25,7 @@ function unblock (jar, token, userId) { url: `//accountsettings.roblox.com/v1/users/${userId}/unblock`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -51,7 +51,7 @@ function unblock (jar, token, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return unblock(jar, xcsrf, args.userId) }) diff --git a/lib/asset/deleteFromInventory.js b/lib/asset/deleteFromInventory.js index 6d62677ef..a613e56aa 100644 --- a/lib/asset/deleteFromInventory.js +++ b/lib/asset/deleteFromInventory.js @@ -27,7 +27,7 @@ function deleteFromInventory (jar, assetId, xcsrf) { method: 'POST', resolveWithFullResponse: true, body: `assetId=${assetId}`, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf, 'content-type': 'application/x-www-form-urlencoded; charset=UTF-8' @@ -62,7 +62,7 @@ function deleteFromInventory (jar, assetId, xcsrf) { // Define exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return deleteFromInventory(jar, args.assetId, xcsrf) }) diff --git a/lib/asset/uploadAnimation.js b/lib/asset/uploadAnimation.js index f621fd62e..db90d94b6 100644 --- a/lib/asset/uploadAnimation.js +++ b/lib/asset/uploadAnimation.js @@ -39,7 +39,7 @@ function upload (data, itemOptions, assetId, jar, token) { options: { resolveWithFullResponse: true, method: 'POST', - jar: jar, + jar, body: data, headers: { 'X-CSRF-TOKEN': token, diff --git a/lib/asset/uploadItem.js b/lib/asset/uploadItem.js index 91dceba4d..0eb540043 100644 --- a/lib/asset/uploadItem.js +++ b/lib/asset/uploadItem.js @@ -28,11 +28,11 @@ function uploadItem (jar, file, name, assetType, groupId) { return getVerification({ url: 'https://www.roblox.com/build/upload', options: { - jar: jar + jar } }).then(function (ver) { const data = { - name: name, + name, assetTypeId: assetType, groupId: groupId || '', __RequestVerificationToken: ver.inputs.__RequestVerificationToken, @@ -51,7 +51,7 @@ function uploadItem (jar, file, name, assetType, groupId) { verification: ver.header, formData: data, resolveWithFullResponse: true, - jar: jar + jar } }).then(function (res) { if (res.statusCode === 302) { diff --git a/lib/asset/uploadModel.js b/lib/asset/uploadModel.js index 05ede0e0b..02fd6c6e7 100644 --- a/lib/asset/uploadModel.js +++ b/lib/asset/uploadModel.js @@ -39,7 +39,7 @@ function upload (data, itemOptions, assetId, jar, token) { options: { resolveWithFullResponse: true, method: 'POST', - jar: jar, + jar, body: data, headers: { 'X-CSRF-TOKEN': token, diff --git a/lib/avatar/avatarRules.js b/lib/avatar/avatarRules.js index 50dfe76fc..24675b028 100644 --- a/lib/avatar/avatarRules.js +++ b/lib/avatar/avatarRules.js @@ -21,7 +21,7 @@ exports.func = (args) => { url: '//avatar.roblox.com/v1/avatar-rules', options: { method: 'GET', - jar: jar, + jar, followRedirect: false, resolveWithFullResponse: true } diff --git a/lib/avatar/getCurrentAvatar.js b/lib/avatar/getCurrentAvatar.js index 7c42bcbc3..0f2f3dbd4 100644 --- a/lib/avatar/getCurrentAvatar.js +++ b/lib/avatar/getCurrentAvatar.js @@ -22,7 +22,7 @@ exports.func = (args) => { url: '//avatar.roblox.com/v1/avatar', options: { method: 'GET', - jar: jar, + jar, followRedirect: false, resolveWithFullResponse: true } diff --git a/lib/avatar/getRecentItems.js b/lib/avatar/getRecentItems.js index 78a537032..bbde8e1f8 100644 --- a/lib/avatar/getRecentItems.js +++ b/lib/avatar/getRecentItems.js @@ -22,7 +22,7 @@ exports.func = (args) => { url: '//avatar.roblox.com/v1/recent-items/' + listType + '/list', options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/avatar/redrawAvatar.js b/lib/avatar/redrawAvatar.js index 0eef52b1d..30e933da3 100644 --- a/lib/avatar/redrawAvatar.js +++ b/lib/avatar/redrawAvatar.js @@ -20,7 +20,7 @@ function redrawAvatar (jar, token) { url: '//avatar.roblox.com/v1/avatar/redraw-thumbnail', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -42,7 +42,7 @@ function redrawAvatar (jar, token) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return redrawAvatar(jar, xcsrf) }) } diff --git a/lib/avatar/removeAssetId.js b/lib/avatar/removeAssetId.js index ff9694fd2..0030f05a2 100644 --- a/lib/avatar/removeAssetId.js +++ b/lib/avatar/removeAssetId.js @@ -22,7 +22,7 @@ function removeAssetId (assetId, jar, xcsrf) { url: 'https://avatar.roblox.com/v1/avatar/assets/' + assetId + '/remove', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf }, @@ -49,7 +49,7 @@ function removeAssetId (assetId, jar, xcsrf) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return removeAssetId(args.assetId, jar, xcsrf) }) } diff --git a/lib/avatar/setAvatarBodyColors.js b/lib/avatar/setAvatarBodyColors.js index cf6477b1b..955de1da8 100644 --- a/lib/avatar/setAvatarBodyColors.js +++ b/lib/avatar/setAvatarBodyColors.js @@ -26,17 +26,17 @@ const nextFunction = (jar, token, headColorId, torsoColorId, rightArmColorId, le url: '//avatar.roblox.com/v1/avatar/set-body-colors', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - headColorId: headColorId, - torsoColorId: torsoColorId, - rightArmColorId: rightArmColorId, - leftArmColorId: leftArmColorId, - rightLegColorId: rightLegColorId, - leftLegColorId: leftLegColorId + headColorId, + torsoColorId, + rightArmColorId, + leftArmColorId, + rightLegColorId, + leftLegColorId }, resolveWithFullResponse: true } @@ -54,7 +54,7 @@ const nextFunction = (jar, token, headColorId, torsoColorId, rightArmColorId, le exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.headColorId, args.torsoColorId, args.rightArmColorId, args.leftArmColorId, args.rightLegColorId, args.leftLegColorId) }) } diff --git a/lib/avatar/setAvatarScales.js b/lib/avatar/setAvatarScales.js index 2f57c776f..cee36f527 100644 --- a/lib/avatar/setAvatarScales.js +++ b/lib/avatar/setAvatarScales.js @@ -26,17 +26,17 @@ const nextFunction = (jar, token, height, width, head, depth, proportion, bodyTy url: '//avatar.roblox.com/v1/avatar/set-scales', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - height: height, - width: width, - head: head, - depth: depth, - proportion: proportion, - bodyType: bodyType + height, + width, + head, + depth, + proportion, + bodyType }, resolveWithFullResponse: true } @@ -54,7 +54,7 @@ const nextFunction = (jar, token, height, width, head, depth, proportion, bodyTy exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.height, args.width, args.head, args.depth, args.proportion, args.bodyType) }) } diff --git a/lib/avatar/setPlayerAvatarType.js b/lib/avatar/setPlayerAvatarType.js index c23bee4be..fa5addaa0 100644 --- a/lib/avatar/setPlayerAvatarType.js +++ b/lib/avatar/setPlayerAvatarType.js @@ -21,7 +21,7 @@ const nextFunction = (jar, token, avatarType) => { url: '//avatar.roblox.com/v1/avatar/set-player-avatar-type', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -44,7 +44,7 @@ const nextFunction = (jar, token, avatarType) => { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.avatarType) }) } diff --git a/lib/avatar/setWearingAssets.js b/lib/avatar/setWearingAssets.js index 8ea319822..ca5667a8b 100644 --- a/lib/avatar/setWearingAssets.js +++ b/lib/avatar/setWearingAssets.js @@ -21,12 +21,12 @@ const nextFunction = (jar, token, assetIds) => { url: '//avatar.roblox.com/v1/avatar/set-wearing-assets', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - assetIds: assetIds + assetIds }, resolveWithFullResponse: true } @@ -44,7 +44,7 @@ const nextFunction = (jar, token, assetIds) => { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.assetIds) }) } diff --git a/lib/avatar/wearAssetId.js b/lib/avatar/wearAssetId.js index d5367744a..6dad06dc5 100644 --- a/lib/avatar/wearAssetId.js +++ b/lib/avatar/wearAssetId.js @@ -22,7 +22,7 @@ function wearAssetId (assetId, jar, xcsrf) { url: 'https://avatar.roblox.com/v1/avatar/assets/' + assetId + '/wear', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf }, @@ -49,7 +49,7 @@ function wearAssetId (assetId, jar, xcsrf) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return wearAssetId(args.assetId, jar, xcsrf) }) } diff --git a/lib/badges/updateBadgeInfo.js b/lib/badges/updateBadgeInfo.js index 68a096065..f39cad3fa 100644 --- a/lib/badges/updateBadgeInfo.js +++ b/lib/badges/updateBadgeInfo.js @@ -28,15 +28,15 @@ const updateInfo = (id, name, desc, enabled, xcrsf, jar) => { options: { resolveWithFullResponse: true, method: 'PATCH', - jar: jar, + jar, headers: { 'Content-Type': 'application/json', 'X-CSRF-TOKEN': xcrsf }, body: JSON.stringify({ - name: name, + name, description: desc, - enabled: enabled + enabled }) } }).then(res => { @@ -75,6 +75,6 @@ exports.func = async (args) => { const enabled = args.enabled || true const jar = args.jar - const xcsrf = await getGeneralToken({ jar: jar }) + const xcsrf = await getGeneralToken({ jar }) return updateInfo(args.badgeId, name, description, enabled, xcsrf, jar) } diff --git a/lib/cache/index.js b/lib/cache/index.js index 62c3abe1b..0bc06fd41 100644 --- a/lib/cache/index.js +++ b/lib/cache/index.js @@ -9,9 +9,9 @@ const wrap = require('./wrap.js') // Define module.exports = { new: newCache, - add: add, - clear: clear, - addIf: addIf, - get: get, - wrap: wrap + add, + clear, + addIf, + get, + wrap } diff --git a/lib/cache/new.js b/lib/cache/new.js index eb82ac116..154c22cec 100644 --- a/lib/cache/new.js +++ b/lib/cache/new.js @@ -6,7 +6,7 @@ module.exports = function (types) { const expireValue = type.expire const permanent = expireValue === true const expire = (permanent || expireValue === false ? 0 : expireValue) - cache[type.name] = { items: {}, expire: expire, refresh: type.refresh, permanent: permanent } + cache[type.name] = { items: {}, expire, refresh: type.refresh, permanent } } return cache } diff --git a/lib/chat/addUsersToConversation.js b/lib/chat/addUsersToConversation.js index 81b900136..7ec357ec5 100644 --- a/lib/chat/addUsersToConversation.js +++ b/lib/chat/addUsersToConversation.js @@ -23,12 +23,12 @@ function addUsersToConversation (conversationId, userIds, jar, token) { url: '//chat.roblox.com/v2/add-to-conversation', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - conversationId: conversationId, + conversationId, participantUserIds: userIds }, resolveWithFullResponse: true @@ -55,7 +55,7 @@ function addUsersToConversation (conversationId, userIds, jar, token) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return addUsersToConversation(args.conversationId, args.userIds, jar, xcsrf) }) } diff --git a/lib/chat/chatSettings.js b/lib/chat/chatSettings.js index 1846ef39f..1098af238 100644 --- a/lib/chat/chatSettings.js +++ b/lib/chat/chatSettings.js @@ -20,7 +20,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/chat-settings', options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/getChatMessages.js b/lib/chat/getChatMessages.js index 5cb150a54..dc08a5819 100644 --- a/lib/chat/getChatMessages.js +++ b/lib/chat/getChatMessages.js @@ -27,7 +27,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/get-messages?conversationId=' + conversationId + '&pageSize=' + pageSize + '&exclusiveStartMessageId=' + startMessageId, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/getConversations.js b/lib/chat/getConversations.js index 548d842f6..b7614694d 100644 --- a/lib/chat/getConversations.js +++ b/lib/chat/getConversations.js @@ -23,7 +23,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/get-conversations?conversationIds=' + conversationIds.join('&conversationIds='), options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/getRolloutSettings.js b/lib/chat/getRolloutSettings.js index 20a311572..1753e79f0 100644 --- a/lib/chat/getRolloutSettings.js +++ b/lib/chat/getRolloutSettings.js @@ -22,7 +22,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/get-rollout-settings?featureNames=' + featureNames.join('&featureNames='), options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/getUnreadConversationCount.js b/lib/chat/getUnreadConversationCount.js index b9f07a955..606ee8c72 100644 --- a/lib/chat/getUnreadConversationCount.js +++ b/lib/chat/getUnreadConversationCount.js @@ -20,7 +20,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/get-unread-conversation-count', options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/getUnreadMessages.js b/lib/chat/getUnreadMessages.js index b6c4cfbfc..9dee2aef2 100644 --- a/lib/chat/getUnreadMessages.js +++ b/lib/chat/getUnreadMessages.js @@ -25,7 +25,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/get-unread-messages?pageSize=' + pageSize + '&conversationIds=' + conversationIds.join('&conversationIds='), options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/getUserConversations.js b/lib/chat/getUserConversations.js index 8e70b7677..48f9a2b42 100644 --- a/lib/chat/getUserConversations.js +++ b/lib/chat/getUserConversations.js @@ -24,7 +24,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/get-user-conversations?pageNumber=' + pageNumber + '&pageSize=' + pageSize, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/markChatAsRead.js b/lib/chat/markChatAsRead.js index db35af7ff..3615b2dc2 100644 --- a/lib/chat/markChatAsRead.js +++ b/lib/chat/markChatAsRead.js @@ -22,13 +22,13 @@ const nextFunction = (jar, token, conversationId, endMessageId) => { url: '//chat.roblox.com/v2/mark-as-read', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - conversationId: conversationId, - endMessageId: endMessageId + conversationId, + endMessageId }, resolveWithFullResponse: true } @@ -46,7 +46,7 @@ const nextFunction = (jar, token, conversationId, endMessageId) => { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.conversationId, args.endMessageId) }) } diff --git a/lib/chat/markChatAsSeen.js b/lib/chat/markChatAsSeen.js index a3d838bfe..aae16b0cd 100644 --- a/lib/chat/markChatAsSeen.js +++ b/lib/chat/markChatAsSeen.js @@ -21,7 +21,7 @@ const nextFunction = (jar, token, conversationIds) => { url: '//chat.roblox.com/v2/mark-as-seen', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -44,7 +44,7 @@ const nextFunction = (jar, token, conversationIds) => { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.conversationIds) }) } diff --git a/lib/chat/multiGetLatestMessages.js b/lib/chat/multiGetLatestMessages.js index f8ec93b52..939fa4728 100644 --- a/lib/chat/multiGetLatestMessages.js +++ b/lib/chat/multiGetLatestMessages.js @@ -24,7 +24,7 @@ exports.func = (args) => { url: '//chat.roblox.com/v2/multi-get-latest-messages?pageSize=' + pageSize + '&conversationIds=' + conversationIds.join('&conversationIds='), options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/chat/onNewConversation.js b/lib/chat/onNewConversation.js index 2502800e4..d8fc4a565 100644 --- a/lib/chat/onNewConversation.js +++ b/lib/chat/onNewConversation.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const onChatEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'ChatNotifications' && message.Type === 'NewConversation') { diff --git a/lib/chat/onNewMessage.js b/lib/chat/onNewMessage.js index 204ef40b3..e5e991b55 100644 --- a/lib/chat/onNewMessage.js +++ b/lib/chat/onNewMessage.js @@ -28,7 +28,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'ChatNotifications' && message.Type === 'NewMessage') { diff --git a/lib/chat/onNewMessageBySelf.js b/lib/chat/onNewMessageBySelf.js index 7535e2a5c..85da17b1d 100644 --- a/lib/chat/onNewMessageBySelf.js +++ b/lib/chat/onNewMessageBySelf.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'ChatNotifications' && message.Type === 'NewMessageBySelf') { diff --git a/lib/chat/onUserOnline.js b/lib/chat/onUserOnline.js index c712a2dca..c41bdbc9d 100644 --- a/lib/chat/onUserOnline.js +++ b/lib/chat/onUserOnline.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PresenceNotifications' && message.Type === 'UserOnline') { diff --git a/lib/chat/onUserTyping.js b/lib/chat/onUserTyping.js index 59013eb97..0c7a626f9 100644 --- a/lib/chat/onUserTyping.js +++ b/lib/chat/onUserTyping.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'ChatNotifications' && message.Type === 'ParticipantTyping') { diff --git a/lib/chat/removeFromGroupConversation.js b/lib/chat/removeFromGroupConversation.js index 9cb93e6cd..1f7be6073 100644 --- a/lib/chat/removeFromGroupConversation.js +++ b/lib/chat/removeFromGroupConversation.js @@ -23,12 +23,12 @@ function removeFromGroupConversation (conversationId, userId, jar, token) { url: '//chat.roblox.com/v2/remove-from-conversation', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - conversationId: conversationId, + conversationId, participantUserId: userId }, resolveWithFullResponse: true @@ -56,7 +56,7 @@ function removeFromGroupConversation (conversationId, userId, jar, token) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return removeFromGroupConversation(args.conversationId, args.userId, jar, xcsrf) }) } diff --git a/lib/chat/renameGroupConversation.js b/lib/chat/renameGroupConversation.js index 121b4cb19..7e2c14509 100644 --- a/lib/chat/renameGroupConversation.js +++ b/lib/chat/renameGroupConversation.js @@ -23,13 +23,13 @@ function renameGroupConversation (conversationId, newTitle, jar, token) { url: '//chat.roblox.com/v2/rename-group-conversation', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - conversationId: conversationId, - newTitle: newTitle + conversationId, + newTitle }, resolveWithFullResponse: true } @@ -51,7 +51,7 @@ function renameGroupConversation (conversationId, newTitle, jar, token) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return renameGroupConversation(args.conversationId, args.title, jar, xcsrf) }) } diff --git a/lib/chat/sendChatMessage.js b/lib/chat/sendChatMessage.js index 9d79af12b..04ada9da4 100644 --- a/lib/chat/sendChatMessage.js +++ b/lib/chat/sendChatMessage.js @@ -23,12 +23,12 @@ function sendChatMessage (conversationId, messageText, jar, token) { url: '//chat.roblox.com/v2/send-message', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - conversationId: conversationId, + conversationId, message: messageText }, resolveWithFullResponse: true @@ -51,7 +51,7 @@ function sendChatMessage (conversationId, messageText, jar, token) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return sendChatMessage(args.conversationId, args.message, jar, xcsrf) }) } diff --git a/lib/chat/setChatUserTyping.js b/lib/chat/setChatUserTyping.js index ebe5fcfa6..05911afba 100644 --- a/lib/chat/setChatUserTyping.js +++ b/lib/chat/setChatUserTyping.js @@ -23,13 +23,13 @@ function setChatUserTyping (conversationId, isTyping, jar, token) { url: '//chat.roblox.com/v2/update-user-typing-status', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - conversationId: conversationId, - isTyping: isTyping + conversationId, + isTyping }, resolveWithFullResponse: true } @@ -55,7 +55,7 @@ function setChatUserTyping (conversationId, isTyping, jar, token) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return setChatUserTyping(args.conversationId, args.isTyping, jar, xcsrf) }) } diff --git a/lib/chat/start121Conversation.js b/lib/chat/start121Conversation.js index 1f3315c6e..e7118be49 100644 --- a/lib/chat/start121Conversation.js +++ b/lib/chat/start121Conversation.js @@ -21,7 +21,7 @@ const nextFunction = (jar, token, userId) => { url: '//chat.roblox.com/v2/start-one-to-one-conversation', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -44,7 +44,7 @@ const nextFunction = (jar, token, userId) => { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.userId) }) } diff --git a/lib/chat/startCloudEditConversation.js b/lib/chat/startCloudEditConversation.js index 40fc42673..c4458965b 100644 --- a/lib/chat/startCloudEditConversation.js +++ b/lib/chat/startCloudEditConversation.js @@ -21,12 +21,12 @@ const nextFunction = (jar, token, placeId) => { url: '//chat.roblox.com/v2/start-cloud-edit-conversation', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - placeId: placeId + placeId }, resolveWithFullResponse: true } @@ -44,7 +44,7 @@ const nextFunction = (jar, token, placeId) => { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.placeId) }) } diff --git a/lib/chat/startGroupConversation.js b/lib/chat/startGroupConversation.js index a1ef41159..137879de0 100644 --- a/lib/chat/startGroupConversation.js +++ b/lib/chat/startGroupConversation.js @@ -23,7 +23,7 @@ function startGroupConversation (userIds, chatTitle, jar, token) { url: '//chat.roblox.com/v2/start-group-conversation', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -56,7 +56,7 @@ function startGroupConversation (userIds, chatTitle, jar, token) { exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return startGroupConversation(args.userIds, args.title, jar, xcsrf) }) } diff --git a/lib/develop/configureItem.js b/lib/develop/configureItem.js index f83641d36..aefb0c326 100644 --- a/lib/develop/configureItem.js +++ b/lib/develop/configureItem.js @@ -29,14 +29,14 @@ function configure (jar, token, id, name, description, enableComments, sellForRo url: '//develop.roblox.com/v1/assets/' + id, options: { method: 'PATCH', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, json: { - name: name, - description: description, - enableComments: enableComments, + name, + description, + enableComments, genres: genreSelection || ['All'], isCopyingAllowed: typeof (sellForRobux) === 'boolean' ? sellForRobux : null } @@ -122,7 +122,7 @@ function configureRobux (args) { function runWithToken (args) { const jar = args.jar return getGeneralToken({ - jar: jar + jar }) .then(function (token) { if (typeof (args.sellForRobux) === 'number') { diff --git a/lib/economy/buy.js b/lib/economy/buy.js index 25f48b13e..ec5b57596 100644 --- a/lib/economy/buy.js +++ b/lib/economy/buy.js @@ -47,7 +47,7 @@ function buy (jar, token, product, price) { url: '//economy.roblox.com/v1/purchases/products/' + productId, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -77,7 +77,7 @@ function buy (jar, token, product, price) { function runWithToken (args) { const jar = args.jar return getGeneralToken({ - jar: jar + jar }) .then(function (token) { return buy(jar, token, args.product, args.price) diff --git a/lib/economy/getGroupFunds.js b/lib/economy/getGroupFunds.js index e11525064..a515bc2b7 100644 --- a/lib/economy/getGroupFunds.js +++ b/lib/economy/getGroupFunds.js @@ -22,7 +22,7 @@ function getGroupFunds (group, jar) { return http({ url: `//economy.roblox.com/v1/groups/${group}/currency`, options: { - jar: jar, + jar, resolveWithFullResponse: true } }) diff --git a/lib/economy/getGroupRevenueSummary.js b/lib/economy/getGroupRevenueSummary.js index ec01631a5..1756b8d42 100644 --- a/lib/economy/getGroupRevenueSummary.js +++ b/lib/economy/getGroupRevenueSummary.js @@ -23,7 +23,7 @@ function getGroupRevenueSummary (group, timeFrame, jar) { return http({ url: `//economy.roblox.com/v1/groups/${group}/revenue/summary/${timeFrame}`, options: { - jar: jar, + jar, resolveWithFullResponse: true } }) diff --git a/lib/economy/getUserTransactions.js b/lib/economy/getUserTransactions.js index 265b4b913..e95316567 100644 --- a/lib/economy/getUserTransactions.js +++ b/lib/economy/getUserTransactions.js @@ -20,7 +20,7 @@ exports.optional = ['transactionType', 'limit', 'sortOrder', 'jar'] exports.func = async function (args) { const jar = args.jar - const currentUser = await getCurrentUser({ jar: jar }) + const currentUser = await getCurrentUser({ jar }) // return getTransactions(currentUser.UserID, transactionType, limit, cursor) return getPageResults({ jar: args.jar, diff --git a/lib/economy/onGroupTransaction.js b/lib/economy/onGroupTransaction.js index ff0730fe2..133f133d7 100644 --- a/lib/economy/onGroupTransaction.js +++ b/lib/economy/onGroupTransaction.js @@ -57,13 +57,13 @@ exports.func = function (args) { const date = new Date() date.setMilliseconds(0) - given.push({ date: date }) + given.push({ date }) latest = date empty = true } } return { - latest: latest, + latest, data: given } } diff --git a/lib/friends/acceptFriendRequest.js b/lib/friends/acceptFriendRequest.js index ad3d34803..d6e81beb9 100644 --- a/lib/friends/acceptFriendRequest.js +++ b/lib/friends/acceptFriendRequest.js @@ -25,7 +25,7 @@ function acceptFriendRequest (jar, token, userId) { url: `//friends.roblox.com/v1/users/${userId}/accept-friend-request`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token, 'Content-Type': 'application/json' @@ -52,7 +52,7 @@ function acceptFriendRequest (jar, token, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return acceptFriendRequest(jar, xcsrf, args.userId) }) diff --git a/lib/friends/declineAllFriendRequests.js b/lib/friends/declineAllFriendRequests.js index 838101874..63f01f344 100644 --- a/lib/friends/declineAllFriendRequests.js +++ b/lib/friends/declineAllFriendRequests.js @@ -24,7 +24,7 @@ function declineAllFriendRequests (jar, token) { url: '//friends.roblox.com/v1/user/friend-requests/decline-all', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -50,7 +50,7 @@ function declineAllFriendRequests (jar, token) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return declineAllFriendRequests(jar, xcsrf) }) diff --git a/lib/friends/declineFriendRequest.js b/lib/friends/declineFriendRequest.js index 5695129ae..c76cd1e29 100644 --- a/lib/friends/declineFriendRequest.js +++ b/lib/friends/declineFriendRequest.js @@ -25,7 +25,7 @@ function declineFriendRequest (jar, token, userId) { url: `//friends.roblox.com/v1/users/${userId}/decline-friend-request`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token, 'Content-Type': 'application/json' @@ -52,7 +52,7 @@ function declineFriendRequest (jar, token, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return declineFriendRequest(jar, xcsrf, args.userId) }) diff --git a/lib/friends/getFollowers.js b/lib/friends/getFollowers.js index 3237acbab..b6abac8eb 100644 --- a/lib/friends/getFollowers.js +++ b/lib/friends/getFollowers.js @@ -26,7 +26,7 @@ function getFollowers (jar, userId, sortOrder, limit, cursor) { url: `//friends.roblox.com/v1/users/${userId}/followers?limit=${limit}&sortOrder=${sortOrder}&cursor=${cursor}`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/friends/getFollowings.js b/lib/friends/getFollowings.js index ebb09d8e6..8055eaacd 100644 --- a/lib/friends/getFollowings.js +++ b/lib/friends/getFollowings.js @@ -26,7 +26,7 @@ function getFollowings (jar, userId, sortOrder, limit, cursor) { url: `//friends.roblox.com/v1/users/${userId}/followings?limit=${limit}&sortOrder=${sortOrder}&cursor=${cursor}`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/friends/getFriendRequests.js b/lib/friends/getFriendRequests.js index c352896a0..efee1146d 100644 --- a/lib/friends/getFriendRequests.js +++ b/lib/friends/getFriendRequests.js @@ -27,7 +27,7 @@ function getFriendsRequests (args) { url: '//friends.roblox.com/v1/my/friends/requests', options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/friends/getFriends.js b/lib/friends/getFriends.js index 9ca35ccd8..c2a5a9294 100644 --- a/lib/friends/getFriends.js +++ b/lib/friends/getFriends.js @@ -22,7 +22,7 @@ function getFriends (jar, userId) { url: `//friends.roblox.com/v1/users/${userId}/friends`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/friends/onFriendRequest.js b/lib/friends/onFriendRequest.js index e12dfa55b..2fe58425c 100644 --- a/lib/friends/onFriendRequest.js +++ b/lib/friends/onFriendRequest.js @@ -30,7 +30,7 @@ exports.optional = ['jar'] exports.func = function (args) { const jar = args.jar const onFriendRequest = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', function (name, message) { if (name === 'FriendshipNotifications' && message.Type === 'FriendshipRequested') { onFriendRequest.emit('data', message.EventArgs.UserId1) diff --git a/lib/friends/removeFriend.js b/lib/friends/removeFriend.js index 375f9d75d..e5b4fd665 100644 --- a/lib/friends/removeFriend.js +++ b/lib/friends/removeFriend.js @@ -25,7 +25,7 @@ function removeFriend (jar, token, userId) { url: `//friends.roblox.com/v1/users/${userId}/unfriend`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -51,7 +51,7 @@ function removeFriend (jar, token, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return removeFriend(jar, xcsrf, args.userId) }) diff --git a/lib/friends/sendFriendRequest.js b/lib/friends/sendFriendRequest.js index 3e3294616..302244805 100644 --- a/lib/friends/sendFriendRequest.js +++ b/lib/friends/sendFriendRequest.js @@ -25,7 +25,7 @@ function sendFriendRequest (jar, token, userId) { url: `//friends.roblox.com/v1/users/${userId}/request-friendship`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token, 'Content-Type': 'application/json' @@ -52,7 +52,7 @@ function sendFriendRequest (jar, token, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return sendFriendRequest(jar, xcsrf, args.userId) }) diff --git a/lib/friends/unfollow.js b/lib/friends/unfollow.js index a3af77bfc..0a1ea9440 100644 --- a/lib/friends/unfollow.js +++ b/lib/friends/unfollow.js @@ -25,7 +25,7 @@ function unfollow (jar, token, userId) { url: `//friends.roblox.com/v1/users/${userId}/unfollow`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -51,7 +51,7 @@ function unfollow (jar, token, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return unfollow(jar, xcsrf, args.userId) }) diff --git a/lib/games/addDeveloperProduct.js b/lib/games/addDeveloperProduct.js index b3546d7f0..b15db2c50 100644 --- a/lib/games/addDeveloperProduct.js +++ b/lib/games/addDeveloperProduct.js @@ -30,7 +30,7 @@ const nextFunction = (jar, token, universeId, name, priceInRobux, description) = url: '//apis.roblox.com/developer-products/v1/universes/' + universeId + '/developerproducts?name=' + name + '&description=' + description + '&priceInRobux=' + priceInRobux, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -59,7 +59,7 @@ const nextFunction = (jar, token, universeId, name, priceInRobux, description) = exports.func = (args) => { const jar = args.jar - return getGeneralToken({ jar: jar }).then((xcsrf) => { + return getGeneralToken({ jar }).then((xcsrf) => { return nextFunction(jar, xcsrf, args.universeId, args.name, args.priceInRobux, args.description) }) } diff --git a/lib/games/checkDeveloperProductName.js b/lib/games/checkDeveloperProductName.js index 0870d13ba..0f270c89b 100644 --- a/lib/games/checkDeveloperProductName.js +++ b/lib/games/checkDeveloperProductName.js @@ -26,7 +26,7 @@ exports.func = (args) => { url: '//www.roblox.com/places/check-developerproduct-name?universeId=' + universeId + '&developerProductId=' + productId + '&developerProductName=' + args.productName + '&_=1515792139751', options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } }).then((res) => { diff --git a/lib/games/configureGamePass.js b/lib/games/configureGamePass.js index 437af240d..9b782c5c1 100644 --- a/lib/games/configureGamePass.js +++ b/lib/games/configureGamePass.js @@ -38,7 +38,7 @@ function configureGamePass (gamePassId, name, description, price, icon, jar, tok url: '//www.roblox.com/game-pass/update', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token, 'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundaryKMFaNaAn4j7XeMO' diff --git a/lib/games/getDeveloperProducts.js b/lib/games/getDeveloperProducts.js index f92347fde..33c3ea027 100644 --- a/lib/games/getDeveloperProducts.js +++ b/lib/games/getDeveloperProducts.js @@ -21,7 +21,7 @@ function getDeveloperProducts (jar, placeId, page) { url: `//api.roblox.com/developerproducts/list?placeid=${placeId}&page=${page}`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/games/getGameRevenue.js b/lib/games/getGameRevenue.js index 1a8972ff0..81f061db5 100644 --- a/lib/games/getGameRevenue.js +++ b/lib/games/getGameRevenue.js @@ -22,7 +22,7 @@ function getGameRevenue (placeId, type, granularity, jar, token) { url: `//develop.roblox.com/v1/places/${placeId}/stats/${type}?granularity=${granularity}`, options: { method: 'GET', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -42,7 +42,7 @@ function getGameRevenue (placeId, type, granularity, jar, token) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return getGameRevenue(args.placeId, args.type, args.granularity, jar, xcsrf) }) diff --git a/lib/games/getGameSocialLinks.js b/lib/games/getGameSocialLinks.js index 2c59bc903..91a2d978d 100644 --- a/lib/games/getGameSocialLinks.js +++ b/lib/games/getGameSocialLinks.js @@ -22,7 +22,7 @@ function getGameSocialLinks (universeId, jar) { return http({ url: `//games.roblox.com/v1/games/${universeId}/social-links/list`, options: { - jar: jar, + jar, resolveWithFullResponse: true } }) diff --git a/lib/games/getPlaceInfo.js b/lib/games/getPlaceInfo.js index 23d280b86..76120cc25 100644 --- a/lib/games/getPlaceInfo.js +++ b/lib/games/getPlaceInfo.js @@ -25,7 +25,7 @@ function getPlaceInfo (placeIds, jar) { options: { json: true, resolveWithFullResponse: true, - jar: jar, + jar, method: 'GET' } } diff --git a/lib/games/getUniverseInfo.js b/lib/games/getUniverseInfo.js index d6f87575e..650f4be6c 100644 --- a/lib/games/getUniverseInfo.js +++ b/lib/games/getUniverseInfo.js @@ -23,7 +23,7 @@ function getUniverseInfo (universeIds, jar) { options: { json: true, resolveWithFullResponse: true, - jar: jar, + jar, method: 'GET' } } diff --git a/lib/games/updateDeveloperProduct.js b/lib/games/updateDeveloperProduct.js index 71a069226..58ddf3b7a 100644 --- a/lib/games/updateDeveloperProduct.js +++ b/lib/games/updateDeveloperProduct.js @@ -20,13 +20,13 @@ exports.optional = ['name', 'description', 'jar'] * noblox.updateDeveloperProduct(1, 2, 10, "An Updated Developer Product", "My new updated product.") **/ -function updateDeveloperProduct(universeId, productId, priceInRobux, name, description, jar, token) { +function updateDeveloperProduct (universeId, productId, priceInRobux, name, description, jar, token) { return new Promise((resolve, reject) => { return http({ url: `//apis.roblox.com/developer-products/v1/universes/${universeId}/developerproducts/${productId}/update`, options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, diff --git a/lib/groups/changeRank.js b/lib/groups/changeRank.js index ab82fc006..1942995f0 100644 --- a/lib/groups/changeRank.js +++ b/lib/groups/changeRank.js @@ -27,12 +27,12 @@ exports.func = function (args) { const target = args.target const amount = args.change const jar = args.jar - return getRankNameInGroup({ group: group, userId: target }) + return getRankNameInGroup({ group, userId: target }) .then(function (rank) { if (rank === 'Guest') { throw new Error('Target user is not in group') } - return getRoles({ group: group }) + return getRoles({ group }) .then(function (roles) { for (let i = 0; i < roles.length; i++) { const role = roles[i] @@ -48,7 +48,7 @@ exports.func = function (args) { throw new Error('Group members cannot be demoted to guest.') } - return setRank({ group: group, target: target, rank: found.id, jar: jar }) + return setRank({ group, target, rank: found.id, jar }) .then(function () { return { newRole: found, oldRole: role } }) diff --git a/lib/groups/deleteWallPost.js b/lib/groups/deleteWallPost.js index 562863be9..45fd42e4e 100644 --- a/lib/groups/deleteWallPost.js +++ b/lib/groups/deleteWallPost.js @@ -26,7 +26,7 @@ function deleteWallPost (jar, token, group, postId) { url: `//groups.roblox.com/v1/groups/${group}/wall/posts/${postId}`, options: { method: 'DELETE', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token }, @@ -53,7 +53,7 @@ function deleteWallPost (jar, token, group, postId) { exports.func = function (args) { const group = args.group const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { if (args.post) { return deleteWallPost(jar, xcsrf, group, args.post.id) diff --git a/lib/groups/deleteWallPostsByUser.js b/lib/groups/deleteWallPostsByUser.js index 30ff83e75..56a97d1ca 100644 --- a/lib/groups/deleteWallPostsByUser.js +++ b/lib/groups/deleteWallPostsByUser.js @@ -26,7 +26,7 @@ function deleteWallPostsByUser (group, userId, jar, xcsrf) { options: { method: 'DELETE', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf } @@ -52,7 +52,7 @@ function deleteWallPostsByUser (group, userId, jar, xcsrf) { // Define exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return deleteWallPostsByUser(args.group, args.userId, args.jar, xcsrf) }) diff --git a/lib/groups/exile.js b/lib/groups/exile.js index 0093a2781..b63e59588 100644 --- a/lib/groups/exile.js +++ b/lib/groups/exile.js @@ -26,7 +26,7 @@ function exileUser (group, target, jar, xcsrf) { options: { method: 'DELETE', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf } @@ -52,7 +52,7 @@ function exileUser (group, target, jar, xcsrf) { // Define exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return exileUser(args.group, args.target, args.jar, xcsrf) }) diff --git a/lib/groups/getAuditLog.js b/lib/groups/getAuditLog.js index 75a7c018b..3b8f8016f 100644 --- a/lib/groups/getAuditLog.js +++ b/lib/groups/getAuditLog.js @@ -28,7 +28,7 @@ function getAuditLog (group, actionType, userId, sortOrder, limit, cursor, jar) options: { method: 'GET', resolveWithFullResponse: true, - jar: jar + jar } } diff --git a/lib/groups/getGroupSocialLinks.js b/lib/groups/getGroupSocialLinks.js index d23111bdc..cd2d96a4e 100644 --- a/lib/groups/getGroupSocialLinks.js +++ b/lib/groups/getGroupSocialLinks.js @@ -21,7 +21,7 @@ function getGroupSocialLinks (groupId, jar) { return http({ url: `//groups.roblox.com/v1/groups/${groupId}/social-links`, options: { - jar: jar, + jar, resolveWithFullResponse: true } }) diff --git a/lib/groups/getGroups.js b/lib/groups/getGroups.js index 2ae0e27c6..db7717ae7 100644 --- a/lib/groups/getGroups.js +++ b/lib/groups/getGroups.js @@ -74,7 +74,7 @@ function getGroups (userId) { function constructRequest (url) { return http({ - url: url, + url, options: { resolveWithFullResponse: true, followRedirect: false, diff --git a/lib/groups/getJoinRequest.js b/lib/groups/getJoinRequest.js index 0837c1e9b..3b3e6c7ff 100644 --- a/lib/groups/getJoinRequest.js +++ b/lib/groups/getJoinRequest.js @@ -25,7 +25,7 @@ function getJoinRequest (jar, group, userId) { url: `//groups.roblox.com/v1/groups/${group}/join-requests/users/${userId}`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/groups/getJoinRequests.js b/lib/groups/getJoinRequests.js index 7d26ddaa3..8746085d9 100644 --- a/lib/groups/getJoinRequests.js +++ b/lib/groups/getJoinRequests.js @@ -27,7 +27,7 @@ function getJoinRequests (jar, group, sortOrder, limit, cursor) { url: `//groups.roblox.com/v1/groups/${group}/join-requests?limit=${limit}&sortOrder=${sortOrder}&cursor=${cursor}`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/groups/getPlayers.js b/lib/groups/getPlayers.js index 5b801aa65..949ac1ef3 100644 --- a/lib/groups/getPlayers.js +++ b/lib/groups/getPlayers.js @@ -27,7 +27,7 @@ function getPlayersInRoleOnPage (jar, group, rolesetId, sortOrder, limit, cursor url: `//groups.roblox.com/v1/groups/${group}/roles/${rolesetId}/users?cursor=${cursor}&limit=${limit}&sortOrder=${sortOrder}`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/groups/getRolePermissions.js b/lib/groups/getRolePermissions.js index 538ebb26e..9fe345ad6 100644 --- a/lib/groups/getRolePermissions.js +++ b/lib/groups/getRolePermissions.js @@ -24,7 +24,7 @@ function getRolePermissions (group, rolesetId, jar) { options: { method: 'GET', resolveWithFullResponse: true, - jar: jar + jar } } diff --git a/lib/groups/getShout.js b/lib/groups/getShout.js index bb33b72bc..a12ddd401 100644 --- a/lib/groups/getShout.js +++ b/lib/groups/getShout.js @@ -24,7 +24,7 @@ function getShout (group, jar) { options: { method: 'GET', resolveWithFullResponse: true, - jar: jar + jar } } diff --git a/lib/groups/getWall.js b/lib/groups/getWall.js index 43fb43980..fbc7d3a17 100644 --- a/lib/groups/getWall.js +++ b/lib/groups/getWall.js @@ -25,7 +25,7 @@ function getPosts (group, sortOrder, limit, cursor, jar) { options: { method: 'GET', resolveWithFullResponse: true, - jar: jar + jar } } diff --git a/lib/groups/groupPayout.js b/lib/groups/groupPayout.js index 38974074f..119c33024 100644 --- a/lib/groups/groupPayout.js +++ b/lib/groups/groupPayout.js @@ -30,7 +30,7 @@ function groupPayout (jar, token, group, data, recurring, usePercentage) { options: { resolveWithFullResponse: true, method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token, 'Content-Type': 'application/json' @@ -96,7 +96,7 @@ exports.func = function (args) { }) } - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return groupPayout(jar, xcsrf, args.group, data, recurring, usePercentage) }) diff --git a/lib/groups/handleJoinRequest.js b/lib/groups/handleJoinRequest.js index e9fc44978..0c19b0330 100644 --- a/lib/groups/handleJoinRequest.js +++ b/lib/groups/handleJoinRequest.js @@ -27,7 +27,7 @@ function handleJoinRequest (group, userId, accept, jar, xcsrf) { options: { method: accept ? 'POST' : 'DELETE', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf } @@ -53,7 +53,7 @@ function handleJoinRequest (group, userId, accept, jar, xcsrf) { // Define exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return handleJoinRequest(args.group, args.userId, args.accept, args.jar, xcsrf) }) diff --git a/lib/groups/leaveGroup.js b/lib/groups/leaveGroup.js index 80e9845b0..75d2eefd6 100644 --- a/lib/groups/leaveGroup.js +++ b/lib/groups/leaveGroup.js @@ -27,7 +27,7 @@ function leaveGroup (group, jar, xcsrf, userId) { options: { method: 'DELETE', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf } @@ -52,9 +52,9 @@ function leaveGroup (group, jar, xcsrf, userId) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(async function (xcsrf) { - const currentUser = await getCurrentUser({ jar: jar }) + const currentUser = await getCurrentUser({ jar }) return leaveGroup(args.group, args.jar, xcsrf, currentUser.UserID) }) } diff --git a/lib/groups/onAuditLog.js b/lib/groups/onAuditLog.js index 667a6b1ea..3854f4da0 100644 --- a/lib/groups/onAuditLog.js +++ b/lib/groups/onAuditLog.js @@ -45,13 +45,13 @@ exports.func = function (args) { empty = false } else if (!empty) { const date = new Date() - given.push({ audit: '', author: { name: '', id: '-1' }, date: date }) + given.push({ audit: '', author: { name: '', id: '-1' }, date }) latest = date empty = true } } return { - latest: latest, + latest, data: given } } diff --git a/lib/groups/onJoinRequest.js b/lib/groups/onJoinRequest.js index 08080a6a6..4074f7d77 100644 --- a/lib/groups/onJoinRequest.js +++ b/lib/groups/onJoinRequest.js @@ -53,7 +53,7 @@ exports.func = function (args) { } } return { - latest: latest, + latest, data: given } }) diff --git a/lib/groups/onJoinRequestHandle.js b/lib/groups/onJoinRequestHandle.js index ee8e6bca0..296a77dcf 100644 --- a/lib/groups/onJoinRequestHandle.js +++ b/lib/groups/onJoinRequestHandle.js @@ -72,7 +72,7 @@ exports.func = function (args) { promise = new Promise(function (resolve, reject) { evt.on('handle', function (request, accept, callback) { const id = request.requester.userId - handleJoinRequest({ jar: jar, group, userId: id, accept: accept }) + handleJoinRequest({ jar, group, userId: id, accept }) .then(function () { handled++ if (callback) { @@ -98,7 +98,7 @@ exports.func = function (args) { }) } return shortPoll({ - getLatest: getLatest, + getLatest, delay: 'onJoinRequestHandle', timeout: -1 }) diff --git a/lib/groups/onShout.js b/lib/groups/onShout.js index b599306e0..236bb0290 100644 --- a/lib/groups/onShout.js +++ b/lib/groups/onShout.js @@ -42,12 +42,12 @@ exports.func = function (args) { empty = false } else if (!empty) { const date = new Date() - given.push({ message: '', author: { name: '', id: '-1' }, date: date }) + given.push({ message: '', author: { name: '', id: '-1' }, date }) latest = date empty = true } return { - latest: latest, + latest, data: given } }) diff --git a/lib/groups/onWallPost.js b/lib/groups/onWallPost.js index 8a6586ec3..1388396f2 100644 --- a/lib/groups/onWallPost.js +++ b/lib/groups/onWallPost.js @@ -32,7 +32,7 @@ exports.func = function (args) { const view = args.view return shortPoll({ getLatest: function (latest) { - return getWall({ group: group, jar: jar, sortOrder: 'Desc' }) + return getWall({ group, jar, sortOrder: 'Desc' }) .then(function (wall) { const posts = wall.data const given = [] @@ -48,7 +48,7 @@ exports.func = function (args) { } } return { - latest: latest, + latest, data: given } }) diff --git a/lib/groups/setGroupDescription.js b/lib/groups/setGroupDescription.js index 546139c9f..488bfbfd0 100644 --- a/lib/groups/setGroupDescription.js +++ b/lib/groups/setGroupDescription.js @@ -29,7 +29,7 @@ function changeGroupDesc (group, description = '', jar, xcsrf) { json: { description }, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf } @@ -58,7 +58,7 @@ function changeGroupDesc (group, description = '', jar, xcsrf) { // Define exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return changeGroupDesc(args.group, args.description, args.jar, xcsrf) }) diff --git a/lib/groups/setGroupName.js b/lib/groups/setGroupName.js index 9f4b86a10..b477b956c 100644 --- a/lib/groups/setGroupName.js +++ b/lib/groups/setGroupName.js @@ -30,7 +30,7 @@ function changeGroupName (group, name, jar, xcsrf) { json: { name }, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf } @@ -59,7 +59,7 @@ function changeGroupName (group, name, jar, xcsrf) { // Define exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return changeGroupName(args.group, args.name, args.jar, xcsrf) }) diff --git a/lib/groups/setRank.js b/lib/groups/setRank.js index e855eef03..b836c2622 100644 --- a/lib/groups/setRank.js +++ b/lib/groups/setRank.js @@ -29,7 +29,7 @@ function setRank (jar, xcsrf, group, target, role) { options: { resolveWithFullResponse: true, method: 'PATCH', - jar: jar, + jar, headers: { 'Content-Type': 'application/json', 'X-CSRF-TOKEN': xcsrf @@ -58,7 +58,7 @@ function setRank (jar, xcsrf, group, target, role) { function runWithToken (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return setRank(jar, xcsrf, args.group, args.target, args.role) }) diff --git a/lib/groups/shout.js b/lib/groups/shout.js index 37a91e5ff..f9487c350 100644 --- a/lib/groups/shout.js +++ b/lib/groups/shout.js @@ -29,7 +29,7 @@ function shoutOnGroup (group, message = '', jar, xcsrf) { json: { message }, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf } @@ -58,7 +58,7 @@ function shoutOnGroup (group, message = '', jar, xcsrf) { // Define exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return shoutOnGroup(args.group, args.message, args.jar, xcsrf) }) diff --git a/lib/inventory/getUAIDs.js b/lib/inventory/getUAIDs.js index 60f488ccc..c0f62cc3b 100644 --- a/lib/inventory/getUAIDs.js +++ b/lib/inventory/getUAIDs.js @@ -21,7 +21,7 @@ exports.optional = ['exclusionList', 'jar'] // Define function getUAIDs (userId, requestedIds, excludedIds) { return new Promise((resolve) => { - getCollectibles({ userId: userId }).then(function (collectibles) { + getCollectibles({ userId }).then(function (collectibles) { const retrievedIds = [] for (let index = 0; index < collectibles.length; index++) { diff --git a/lib/options.js b/lib/options.js index c64317414..8a7c94c5e 100644 --- a/lib/options.js +++ b/lib/options.js @@ -12,7 +12,7 @@ exports.init = function () { for (const name of Object.keys(cache)) { const item = cache[name] const cacheObj = { - name: name, + name, refresh: item.refresh, expire: item.expire } diff --git a/lib/party/onPartyDeleted.js b/lib/party/onPartyDeleted.js index cd3674443..743a846a3 100644 --- a/lib/party/onPartyDeleted.js +++ b/lib/party/onPartyDeleted.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'PartyDeleted') { diff --git a/lib/party/onPartyInvite.js b/lib/party/onPartyInvite.js index 02148bc11..bac47aad5 100644 --- a/lib/party/onPartyInvite.js +++ b/lib/party/onPartyInvite.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'InvitedToParty') { diff --git a/lib/party/onPartyJoinedGame.js b/lib/party/onPartyJoinedGame.js index d9cfbd1b9..d69cdf413 100644 --- a/lib/party/onPartyJoinedGame.js +++ b/lib/party/onPartyJoinedGame.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'PartyJoinedGame') { diff --git a/lib/party/onPartyLeftGame.js b/lib/party/onPartyLeftGame.js index c70f07cd1..6bd73035d 100644 --- a/lib/party/onPartyLeftGame.js +++ b/lib/party/onPartyLeftGame.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'PartyLeftGame') { diff --git a/lib/party/onPartySelfJoined.js b/lib/party/onPartySelfJoined.js index f0e7fe50b..68db00e6f 100644 --- a/lib/party/onPartySelfJoined.js +++ b/lib/party/onPartySelfJoined.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'IJoinedParty') { diff --git a/lib/party/onPartySelfLeft.js b/lib/party/onPartySelfLeft.js index 747c1cc97..ab4dca534 100644 --- a/lib/party/onPartySelfLeft.js +++ b/lib/party/onPartySelfLeft.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'ILeftParty') { diff --git a/lib/party/onPartyUserJoined.js b/lib/party/onPartyUserJoined.js index 677c94981..86c8ffe64 100644 --- a/lib/party/onPartyUserJoined.js +++ b/lib/party/onPartyUserJoined.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'PartyUserJoined') { diff --git a/lib/party/onPartyUserLeft.js b/lib/party/onPartyUserLeft.js index 4a4c5775b..49c354d89 100644 --- a/lib/party/onPartyUserLeft.js +++ b/lib/party/onPartyUserLeft.js @@ -25,7 +25,7 @@ exports.optional = ['jar'] exports.func = (args) => { const jar = args.jar const newEvent = new events.EventEmitter() - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', (name, message) => { if (name === 'PartyNotifications' && message.Type === 'PartyUserLeft') { diff --git a/lib/premiumfeatures/getPremium.js b/lib/premiumfeatures/getPremium.js index 96eb1889c..6db6141d3 100644 --- a/lib/premiumfeatures/getPremium.js +++ b/lib/premiumfeatures/getPremium.js @@ -24,7 +24,7 @@ function getPremium (jar, userId) { url: `https://premiumfeatures.roblox.com/v1/users/${userId}/validate-membership`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/presence/getPresences.js b/lib/presence/getPresences.js index e8fdc6766..a27b6c750 100644 --- a/lib/presence/getPresences.js +++ b/lib/presence/getPresences.js @@ -26,7 +26,7 @@ function getPresences (userIds, jar, xcsrf) { options: { method: 'POST', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf, 'Content-Type': 'application/json' @@ -56,7 +56,7 @@ function getPresences (userIds, jar, xcsrf) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return getPresences(args.userIds, args.jar, xcsrf) }) diff --git a/lib/privatemessages/getMessages.js b/lib/privatemessages/getMessages.js index 9d5b36df0..2d7f73129 100644 --- a/lib/privatemessages/getMessages.js +++ b/lib/privatemessages/getMessages.js @@ -25,7 +25,7 @@ function getMessages (jar, token, pageNumber, pageSize, messageTab) { url: `//privatemessages.roblox.com/v1/messages?pageNumber=${pageNumber}&pageSize=${pageSize}&messageTab=${messageTab}`, options: { method: 'GET', - jar: jar, + jar, resolveWithFullResponse: true } } diff --git a/lib/privatemessages/message.js b/lib/privatemessages/message.js index b09d90ab3..9870c2026 100644 --- a/lib/privatemessages/message.js +++ b/lib/privatemessages/message.js @@ -32,7 +32,7 @@ function message (jar, token, senderId, recipient, subject, body, replyMessageId url: '//privatemessages.roblox.com/v1/messages/send', options: { method: 'POST', - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': token, 'Content-Type': 'application/json' @@ -67,10 +67,10 @@ function message (jar, token, senderId, recipient, subject, body, replyMessageId exports.func = function (args) { const jar = args.jar - return queue('Message', getHash({ jar: jar }), function () { - return getGeneralToken({ jar: jar }) + return queue('Message', getHash({ jar }), function () { + return getGeneralToken({ jar }) .then(function (xcsrf) { - return getSenderId({ jar: jar }).then((senderId) => { + return getSenderId({ jar }).then((senderId) => { return message(jar, xcsrf, senderId, args.recipient, args.subject, args.body, args.replyMessageId, args.includePreviousMessage) }) }) diff --git a/lib/privatemessages/onMessage.js b/lib/privatemessages/onMessage.js index 28f2d06de..f6bae46c2 100644 --- a/lib/privatemessages/onMessage.js +++ b/lib/privatemessages/onMessage.js @@ -34,17 +34,17 @@ exports.func = function (args) { const onMessage = new events.EventEmitter() let waitingForRequest = false let latest - getMessages({ jar: jar, messageTab: 'Inbox', pageNumber: 0 }) + getMessages({ jar, messageTab: 'Inbox', pageNumber: 0 }) .then(function (initial) { latest = initial.collection[0] ? initial.collection[0].id : 0 - const notifications = onNotification({ jar: jar }) + const notifications = onNotification({ jar }) notifications.on('data', function (name, message) { if (name === 'NotificationStream' && message.Type === 'NewNotification') { if (waitingForRequest) { waitingForRequest = false } else { getMessages({ - jar: jar, + jar, messageTab: 'Inbox', pageNumber: 0 }) diff --git a/lib/trades/acceptTrade.js b/lib/trades/acceptTrade.js index 938be5c2b..d34ba9785 100644 --- a/lib/trades/acceptTrade.js +++ b/lib/trades/acceptTrade.js @@ -26,7 +26,7 @@ function acceptTrade (tradeId, jar, xcsrf) { options: { method: 'POST', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf, 'Content-Type': 'application/json' @@ -51,7 +51,7 @@ function acceptTrade (tradeId, jar, xcsrf) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return acceptTrade(args.tradeId, jar, xcsrf) }) diff --git a/lib/trades/canTradeWith.js b/lib/trades/canTradeWith.js index 11609af6e..376d504f6 100644 --- a/lib/trades/canTradeWith.js +++ b/lib/trades/canTradeWith.js @@ -25,7 +25,7 @@ function canTradeWith (jar, userId) { options: { method: 'GET', resolveWithFullResponse: true, - jar: jar + jar } }).then((res) => { if (res.statusCode === 200) { diff --git a/lib/trades/counterTrade.js b/lib/trades/counterTrade.js index 3dde9b529..6e24c34ed 100644 --- a/lib/trades/counterTrade.js +++ b/lib/trades/counterTrade.js @@ -37,7 +37,7 @@ function counterTrade (tradeId, targetUserId, sendingOffer, receivingOffer, jar, options: { method: 'POST', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf, 'Content-Type': 'application/json' @@ -75,8 +75,8 @@ function counterTrade (tradeId, targetUserId, sendingOffer, receivingOffer, jar, exports.func = function (args) { const jar = args.jar return Promise.all([ - getGeneralToken({ jar: jar }), - getCurrentUser({ jar: jar, option: 'UserID' }) + getGeneralToken({ jar }), + getCurrentUser({ jar, option: 'UserID' }) ]) .then(function (resolvedPromises) { return counterTrade(args.tradeId, args.targetUserId, args.sendingOffer, args.receivingOffer, jar, resolvedPromises[0], resolvedPromises[1]) diff --git a/lib/trades/declineTrade.js b/lib/trades/declineTrade.js index 7a492de4a..ef132b144 100644 --- a/lib/trades/declineTrade.js +++ b/lib/trades/declineTrade.js @@ -26,7 +26,7 @@ function declineTrade (tradeId, jar, xcsrf) { options: { method: 'POST', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf, 'Content-Type': 'application/json' @@ -51,7 +51,7 @@ function declineTrade (tradeId, jar, xcsrf) { exports.func = function (args) { const jar = args.jar - return getGeneralToken({ jar: jar }) + return getGeneralToken({ jar }) .then(function (xcsrf) { return declineTrade(args.tradeId, jar, xcsrf) }) diff --git a/lib/trades/getTradeInfo.js b/lib/trades/getTradeInfo.js index 04269cf60..a49c7d037 100644 --- a/lib/trades/getTradeInfo.js +++ b/lib/trades/getTradeInfo.js @@ -25,7 +25,7 @@ const getTradeInfo = (jar, tradeId) => { options: { method: 'GET', resolveWithFullResponse: true, - jar: jar + jar } }).then((res) => { if (res.statusCode === 200) { diff --git a/lib/trades/sendTrade.js b/lib/trades/sendTrade.js index 685ae0d47..40706d5f8 100644 --- a/lib/trades/sendTrade.js +++ b/lib/trades/sendTrade.js @@ -35,7 +35,7 @@ function sendTrade (targetUserId, sendingOffer, receivingOffer, jar, xcsrf, logg options: { method: 'POST', resolveWithFullResponse: true, - jar: jar, + jar, headers: { 'X-CSRF-TOKEN': xcsrf, 'Content-Type': 'application/json' @@ -73,8 +73,8 @@ function sendTrade (targetUserId, sendingOffer, receivingOffer, jar, xcsrf, logg exports.func = function (args) { const jar = args.jar return Promise.all([ - getGeneralToken({ jar: jar }), - getCurrentUser({ jar: jar, option: 'UserID' }) + getGeneralToken({ jar }), + getCurrentUser({ jar, option: 'UserID' }) ]) .then(function (resolvedPromises) { return sendTrade(args.targetUserId, args.sendingOffer, args.receivingOffer, jar, resolvedPromises[0], resolvedPromises[1]) diff --git a/lib/users/getPlayerInfo.js b/lib/users/getPlayerInfo.js index 169e1b0cc..0fe59c75f 100644 --- a/lib/users/getPlayerInfo.js +++ b/lib/users/getPlayerInfo.js @@ -44,11 +44,11 @@ function getPlayerInfo (userId) { const displayName = userBody.displayName resolve({ - username: username, - joinDate: joinDate, - blurb: blurb, - isBanned: isBanned, - displayName: displayName + username, + joinDate, + blurb, + isBanned, + displayName }) } else if (failedResponse) { reject(new Error('User does not exist.')) @@ -86,7 +86,7 @@ function getPlayerInfo (userId) { function constructRequest (url) { return http({ - url: url, + url, options: { resolveWithFullResponse: true, followRedirect: false, diff --git a/lib/users/onBlurbChange.js b/lib/users/onBlurbChange.js index 2bc128662..3f583d463 100644 --- a/lib/users/onBlurbChange.js +++ b/lib/users/onBlurbChange.js @@ -36,7 +36,7 @@ exports.func = function (args) { } return { - latest: latest, + latest, data: given } }) diff --git a/lib/util/generalRequest.js b/lib/util/generalRequest.js index d8e39f971..c8ad84362 100644 --- a/lib/util/generalRequest.js +++ b/lib/util/generalRequest.js @@ -28,12 +28,12 @@ function general (jar, url, inputs, events, customOpt, body) { inputs[input] = events[input] } const httpOpt = { - url: url, + url, options: { resolveWithFullResponse: true, method: 'POST', form: inputs, - jar: jar + jar } } if (customOpt) { @@ -44,8 +44,8 @@ function general (jar, url, inputs, events, customOpt, body) { } return http(httpOpt).then(function (res) { return { - res: res, - body: body + res, + body } }) } @@ -54,7 +54,7 @@ exports.func = function (args) { const jar = args.jar const url = args.url const custom = args.http - return getVerification({ url: custom ? (custom.url || url) : url, jar: jar, ignoreCache: args.ignoreCache, getBody: args.getBody }) + return getVerification({ url: custom ? (custom.url || url) : url, jar, ignoreCache: args.ignoreCache, getBody: args.getBody }) .then(function (response) { return general(jar, url, response.inputs, args.events, args.http, response.body) }) diff --git a/lib/util/getAction.js b/lib/util/getAction.js index 1b9d5553d..5f5a7618e 100644 --- a/lib/util/getAction.js +++ b/lib/util/getAction.js @@ -40,6 +40,6 @@ exports.func = function (args) { found = found && parseInt(found[1], 10) return { target: found, - params: params + params } } diff --git a/lib/util/getCurrentUser.js b/lib/util/getCurrentUser.js index 8c84df0ac..1bce78220 100644 --- a/lib/util/getCurrentUser.js +++ b/lib/util/getCurrentUser.js @@ -26,7 +26,7 @@ exports.func = async function (args) { resolveWithFullResponse: true, method: 'GET', followRedirect: false, - jar: jar + jar } } const res = await http(httpOpt) diff --git a/lib/util/getGeneralToken.js b/lib/util/getGeneralToken.js index 1c83cf906..1d2fcc245 100644 --- a/lib/util/getGeneralToken.js +++ b/lib/util/getGeneralToken.js @@ -30,7 +30,7 @@ function getGeneralToken (jar) { options: { resolveWithFullResponse: true, method: 'POST', - jar: jar + jar } } return http(httpOpt) @@ -46,7 +46,7 @@ function getGeneralToken (jar) { exports.func = function (args) { const jar = args.jar - return cache.wrap('XCSRF', getHash({ jar: jar }), function () { + return cache.wrap('XCSRF', getHash({ jar }), function () { return getGeneralToken(jar) }) } diff --git a/lib/util/getPageResults.js b/lib/util/getPageResults.js index 5609d2bf8..11c78b06a 100644 --- a/lib/util/getPageResults.js +++ b/lib/util/getPageResults.js @@ -27,7 +27,7 @@ function getPageResults (jar, url, query, sortOrder, limit, pageCursor, results) const allowedLimits = [10, 25, 50, 100] const httpOpt = { - url: url, + url, options: { qs: { limit: limit <= 100 ? allowedLimits.reduce((prev, curr) => Math.abs(curr - limit) < Math.abs(prev - limit) ? curr : prev) : 100, // Get the most fit page limit within the boundries. @@ -36,7 +36,7 @@ function getPageResults (jar, url, query, sortOrder, limit, pageCursor, results) }, method: 'GET', resolveWithFullResponse: true, - jar: jar, + jar, json: true } } diff --git a/lib/util/getSenderUserId.js b/lib/util/getSenderUserId.js index cffb06e26..c021a87b1 100644 --- a/lib/util/getSenderUserId.js +++ b/lib/util/getSenderUserId.js @@ -21,8 +21,8 @@ exports.optional = ['jar'] // Define exports.func = function (args) { const jar = args.jar - return cache.wrap('SenderID', getHash({ jar: jar }), function () { - return getCurrentUser({ jar: jar }) + return cache.wrap('SenderID', getHash({ jar }), function () { + return getCurrentUser({ jar }) .then(function (info) { return info.UserID }) diff --git a/lib/util/getVerification.js b/lib/util/getVerification.js index df1945197..d1653e1af 100644 --- a/lib/util/getVerification.js +++ b/lib/util/getVerification.js @@ -27,10 +27,10 @@ exports.optional = ['ignoreCache', 'getBody', 'jar'] // Define function getVerification (jar, url, getBody) { const httpOpt = { - url: url, + url, options: { resolveWithFullResponse: true, - jar: jar + jar } } return http(httpOpt) @@ -42,7 +42,7 @@ function getVerification (jar, url, getBody) { } return { body: (getBody ? res.body : null), - inputs: inputs, + inputs, header: match && match[1] } }) @@ -53,7 +53,7 @@ exports.func = function (args) { if (args.ignoreCache) { return getVerification(jar, args.url, args.getBody) } else { - return cache.wrap('Verify', new URL(args.url).pathname + getHash({ jar: jar }), function () { + return cache.wrap('Verify', new URL(args.url).pathname + getHash({ jar }), function () { return getVerification(jar, args.url, args.getBody) }) } diff --git a/lib/util/http.js b/lib/util/http.js index d0c231077..867b817bf 100644 --- a/lib/util/http.js +++ b/lib/util/http.js @@ -98,7 +98,7 @@ exports.func = function (args) { } } else { if (depth > 0) { - cache.add(options.cache, 'XCSRF', getHash({ jar: jar }), opt.headers['X-CSRF-TOKEN']) + cache.add(options.cache, 'XCSRF', getHash({ jar }), opt.headers['X-CSRF-TOKEN']) } } }