From 41affeae6ece715d0531e123799c437991338f4a Mon Sep 17 00:00:00 2001 From: Carter Penterman Date: Wed, 21 Aug 2024 16:55:26 -0500 Subject: [PATCH 1/2] Initial fix --- commands/take.js | 34 ++++++++++++++++++++++------------ common.js | 18 ++++++++++++++---- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/commands/take.js b/commands/take.js index 4c0fdc1..69ca127 100644 --- a/commands/take.js +++ b/commands/take.js @@ -44,24 +44,33 @@ async function execute(interaction) { await interaction.editReply(`🚫 This asset (id: ${id}) is not a model. Your map must be a model.`); return; } - if (assetInfo.price !== 0) { + if (!assetInfo.isFree) { await interaction.editReply(`🚫 This model (id: ${id}) is not free. Please change the price to be free.`); return; } - // Make a "fake" product info object for the Noblox buy method - const productInfo = { - PriceInRobux: assetInfo.price, - ProductId: assetInfo.productId, - Creator: { - Id: assetInfo.creatorId - } - }; - // Kick off the buy request let buyPromise; if (!alreadyOwned) { - buyPromise = noblox.buy({product: productInfo, price: 0}); + const jar = noblox.options.jar; + const xcsrf = await noblox.getGeneralToken(jar); + buyPromise = noblox.http("https://apis.roblox.com/marketplace-fiat-service/v1/product/purchase", { + method: "POST", + resolveWithFullResponse: true, + jar, + headers: { + "X-CSRF-TOKEN": xcsrf, + "Content-Type": "application/json" + }, + body: JSON.stringify({ + expectedPrice: {currencyCode: "USD", quantity: {significand: 0, exponent: 0}}, + productKey: { + productNamespace: "PRODUCT_NAMESPACE_CREATOR_MARKETPLACE_ASSET", + productTargetId: `${id}`, + productType: "PRODUCT_TYPE_MODEL" + } + }) + }); } // Validate and send the validation result @@ -76,7 +85,8 @@ async function execute(interaction) { } // Make sure the buy request is done - await buyPromise; + const res = await buyPromise; + console.log(JSON.parse(res.body)); await interaction.followUp( ` Now that your [map (id: ${id})]() has been taken by the bot you can load it into the [${game} maptest place](<${gamePlaces[game]}>). diff --git a/common.js b/common.js index 9a1f53f..ae240d0 100644 --- a/common.js +++ b/common.js @@ -40,16 +40,26 @@ async function getAssetInfo(assetId) { const data = res.data.data; const assetInfo = data[0]; - + let isFree, forSale; + if (assetInfo.fiatProduct) { + const quantity = assetInfo.fiatProduct.purchasePrice.quantity; + isFree = quantity.significand === 0 && quantity.exponent === 0; + forSale = assetInfo.fiatProduct.published && assetInfo.fiatProduct.purchasable; + } + else { + isFree = assetInfo.product.price === 0; + forSale = assetInfo.product.isForSaleOrIsPublicDomain; + } + console.log(assetInfo); + return { status: res.status, id: assetId, name: assetInfo.asset.name, typeId: assetInfo.asset.typeId, creatorId: assetInfo.creator.id, - price: assetInfo.product.price, - productId: assetInfo.product.productId, - forSale: assetInfo.product.isForSaleOrIsPublicDomain + isFree: isFree, + forSale: forSale }; } -- 2.45.2 From 4f77012a9a6c0b29597430b6c98827cc3504a16c Mon Sep 17 00:00:00 2001 From: Carter Penterman Date: Wed, 21 Aug 2024 22:48:30 -0500 Subject: [PATCH 2/2] Use new asset API --- commands/submit.js | 13 +++----- commands/take.js | 46 ++++++++++----------------- common.js | 79 +++++++++++++++++++++++++++++++--------------- 3 files changed, 74 insertions(+), 64 deletions(-) diff --git a/commands/submit.js b/commands/submit.js index ffd0080..a2d6468 100644 --- a/commands/submit.js +++ b/commands/submit.js @@ -4,7 +4,7 @@ const fs = require('node:fs'); const noblox = require("noblox.js"); const axios = require("axios").default; const { submissions, commands, cookies } = require("../config/config.js"); -const { AssetType, getAssetInfo, SubmissionColumnsString, createSubmissionLine, getSubmissionLine, validateMapAsset, getValidationMessage } = require("../common.js"); +const { getAssetInfo, SubmissionColumnsString, createSubmissionLine, getSubmissionLine, validateMapAsset, getValidationMessage } = require("../common.js"); async function robloxUserFromDiscord(id) { if (isNaN(id)) return undefined; @@ -50,12 +50,10 @@ async function execute(interaction) { const id = interaction.options.getInteger("asset_id", true); await noblox.setCookie(cookies[game]); - - try { // Check that the bot owns this model if (!(await noblox.getOwnership(await noblox.getCurrentUser("UserID"), id, "Asset"))) { - const msg = `🚫 The ${game} maptest bot's inventory does not contain this asset (id: ${id}). You must use the /take command first.`; + const msg = `🚫 The ${game} maptest bot's inventory does not contain this asset (\`${id}\`). You must use the /take command first.`; await interaction.editReply(msg); return; } @@ -63,13 +61,13 @@ async function execute(interaction) { if (error.message !== "400 The specified Asset does not exist!") { throw error; } - await interaction.editReply(`🚫 This asset does not exist (id: ${id}).`); + await interaction.editReply(`🚫 This asset does not exist (\`${id}\`).`); return; } const assetInfo = await getAssetInfo(id); - if (assetInfo.typeId !== AssetType.Model) { - await interaction.editReply(`🚫 This asset (id: ${id}) is not a model. Your map must be a model.`); + if (!assetInfo.isModel) { + await interaction.editReply(`🚫 This asset (\`${id}\`) is not a model. Your map must be a model.`); return; } @@ -82,7 +80,6 @@ async function execute(interaction) { await interaction.editReply(msg); return; } - const csvFile = fs.readFileSync(fname); const lines = parse(csvFile, {delimiter: ',', fromLine: 2}); diff --git a/commands/take.js b/commands/take.js index 69ca127..2270eb9 100644 --- a/commands/take.js +++ b/commands/take.js @@ -1,7 +1,7 @@ const { SlashCommandBuilder } = require('@discordjs/builders'); const noblox = require("noblox.js"); const { cookies, commands, gamePlaces } = require("../config/config.js"); -const { AssetType, getAssetInfo, validateMapAsset, getValidationMessage } = require("../common.js"); +const { getAssetInfo, buyModel, validateMapAsset, getValidationMessage } = require("../common.js"); /** * @param {import('discord.js').ChatInputCommandInteraction} interaction @@ -25,52 +25,34 @@ async function execute(interaction) { if (error.message !== "400 The specified Asset does not exist!") { throw error; } - await interaction.editReply(`🚫 This asset does not exist (id: ${id}).`); + await interaction.editReply(`🚫 This asset does not exist (id: \`${id}\`).`); return; } // Validate that this is a model const assetInfo = await getAssetInfo(id); - if (assetInfo.status !== 403 && (assetInfo.status < 200 || assetInfo.status > 300)) { - await interaction.editReply(`🚫 This asset may not exist or is not a model (id: ${id}). Your map must be a model.`); + if (assetInfo.status !== 403 && (assetInfo.status < 200 || assetInfo.status >= 300)) { + await interaction.editReply(`🚫 This asset may not exist or is not a model (id: \`${id}\`). Your map must be a model.`); return; } // 403 (Forbidden) means the asset isn't distributed - if (assetInfo.status === 403 || !assetInfo.forSale) { - await interaction.editReply(`🚫 This model (id: ${id}) is off sale. Please configure it to be on sale (Configure -> Distribute on Creator Store). It is also possible that this is not a valid model.`); + if (assetInfo.status === 403 || (assetInfo.forSale === false)) { + await interaction.editReply(`🚫 This [model]() (id: \`${id}\`) is off sale. Please configure it to be on sale (Configure -> Distribute on Creator Store).`); return; } - if (assetInfo.typeId !== AssetType.Model) { - await interaction.editReply(`🚫 This asset (id: ${id}) is not a model. Your map must be a model.`); + if (!assetInfo.isModel) { + await interaction.editReply(`🚫 This asset (id: \`${id}\` is not a model. Your map must be a model.`); return; } if (!assetInfo.isFree) { - await interaction.editReply(`🚫 This model (id: ${id}) is not free. Please change the price to be free.`); + await interaction.editReply(`🚫 This [model]() (id: \`${id}\`) is not free. Please change the price to be free.`); return; } // Kick off the buy request let buyPromise; if (!alreadyOwned) { - const jar = noblox.options.jar; - const xcsrf = await noblox.getGeneralToken(jar); - buyPromise = noblox.http("https://apis.roblox.com/marketplace-fiat-service/v1/product/purchase", { - method: "POST", - resolveWithFullResponse: true, - jar, - headers: { - "X-CSRF-TOKEN": xcsrf, - "Content-Type": "application/json" - }, - body: JSON.stringify({ - expectedPrice: {currencyCode: "USD", quantity: {significand: 0, exponent: 0}}, - productKey: { - productNamespace: "PRODUCT_NAMESPACE_CREATOR_MARKETPLACE_ASSET", - productTargetId: `${id}`, - productType: "PRODUCT_TYPE_MODEL" - } - }) - }); + buyPromise = buyModel(id); } // Validate and send the validation result @@ -85,8 +67,12 @@ async function execute(interaction) { } // Make sure the buy request is done - const res = await buyPromise; - console.log(JSON.parse(res.body)); + const success = await buyPromise; + if (!success) { + await interaction.followUp(`🚫 Something went wrong when trying to buy the [model]() (id: \`${id}\`).`); + return; + } + await interaction.followUp( ` Now that your [map (id: ${id})]() has been taken by the bot you can load it into the [${game} maptest place](<${gamePlaces[game]}>). diff --git a/common.js b/common.js index ae240d0..3aba732 100644 --- a/common.js +++ b/common.js @@ -1,5 +1,6 @@ const axios = require("axios").default; const { RobloxFile } = require("rbxm-parser"); +const noblox = require("noblox.js"); // https://create.roblox.com/docs/reference/engine/enums/AssetType const AssetType = { @@ -25,44 +26,70 @@ const AssetType = { }; async function getAssetInfo(assetId) { - const res = await axios.get("https://apis.roblox.com/toolbox-service/v1/items/details", { - params: { - assetIds: assetId - }, - validateStatus: (_status) => true + const jar = noblox.options.jar; + const xcsrf = await noblox.getGeneralToken(jar); + + const res = await noblox.http(`https://apis.roblox.com/user/cloud/v2/creator-store-products/PRODUCT_NAMESPACE_CREATOR_MARKETPLACE_ASSET-PRODUCT_TYPE_MODEL-${assetId}`, { + method: "GET", + resolveWithFullResponse: true, + jar: jar, + headers: { + "X-CSRF-TOKEN": xcsrf, + "Content-Type": "application/json" + } }); - if (res.status < 200 || res.status > 300) { + if (res.statusCode < 200 || res.statusCode >= 300) { return { - status: res.status + status: res.status, + isModel: false }; } - const data = res.data.data; - const assetInfo = data[0]; - let isFree, forSale; - if (assetInfo.fiatProduct) { - const quantity = assetInfo.fiatProduct.purchasePrice.quantity; - isFree = quantity.significand === 0 && quantity.exponent === 0; - forSale = assetInfo.fiatProduct.published && assetInfo.fiatProduct.purchasable; - } - else { - isFree = assetInfo.product.price === 0; - forSale = assetInfo.product.isForSaleOrIsPublicDomain; - } - console.log(assetInfo); + const assetInfo = JSON.parse(res.body); + const quantity = assetInfo.purchasePrice.quantity; + const isFree = quantity.significand === 0 && quantity.exponent === 0; + const forSale = assetInfo.published && assetInfo.purchasable; return { - status: res.status, - id: assetId, - name: assetInfo.asset.name, - typeId: assetInfo.asset.typeId, - creatorId: assetInfo.creator.id, + status: res.statusCode, + isModel: true, + id: assetInfo.modelAssetId, + creatorId: +assetInfo.userSeller, isFree: isFree, forSale: forSale }; } +async function buyModel(modelId) { + const reqJson = { + expectedPrice: {currencyCode: "USD", quantity: {significand: 0, exponent: 0}}, + productKey: { + productNamespace: "PRODUCT_NAMESPACE_CREATOR_MARKETPLACE_ASSET", + productTargetId: `${modelId}`, + productType: "PRODUCT_TYPE_MODEL" + } + }; + + const jar = noblox.options.jar; + const xcsrf = await noblox.getGeneralToken(jar); + + const res = await noblox.http("https://apis.roblox.com/marketplace-fiat-service/v1/product/purchase", { + method: "POST", + resolveWithFullResponse: true, + jar: jar, + headers: { + "X-CSRF-TOKEN": xcsrf, + "Content-Type": "application/json" + }, + body: JSON.stringify(reqJson) + }); + + const resJson = JSON.parse(res.body); + // Return true if purchased, false otherwise + return res.statusCode >= 200 && res.statusCode < 300 && resJson.purchaseTransactionStatus === "PURCHASE_TRANSACTION_STATUS_SUCCESS"; +} + const SubmissionColumnsString = "map_id,unix_timestamp,user_id,username,display_name,creator\n"; const SubmissionColumn = { @@ -321,4 +348,4 @@ function getValidationMessage(validation, game, errorOnFail) { return msg; } -module.exports = { AssetType, getAssetInfo, SubmissionColumn, SubmissionColumnsString, getSubmissionLine, createSubmissionLine, validateMapAsset, getValidationMessage, safeCsvFormat }; \ No newline at end of file +module.exports = { AssetType, getAssetInfo, buyModel, SubmissionColumn, SubmissionColumnsString, getSubmissionLine, createSubmissionLine, validateMapAsset, getValidationMessage, safeCsvFormat }; \ No newline at end of file -- 2.45.2