Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee7aa9921b | ||
|
|
964415198a |
@@ -2,6 +2,7 @@ import Game from '../models/Game.js'
|
|||||||
import steamScraper from '../scripts/scraper.js'
|
import steamScraper from '../scripts/scraper.js'
|
||||||
import asyncHandler from '../middleware/async.js'
|
import asyncHandler from '../middleware/async.js'
|
||||||
import ErrorResponse from '../utils/errorResponse.js'
|
import ErrorResponse from '../utils/errorResponse.js'
|
||||||
|
import normalizeSteamId from '../utils/normalizeSteamId.js'
|
||||||
|
|
||||||
const checkForHexRegExp = new RegExp('^[0-9a-fA-F]{24}$')
|
const checkForHexRegExp = new RegExp('^[0-9a-fA-F]{24}$')
|
||||||
const checkForTwelveRegExp = new RegExp('^[0-9a-fA-F]{12}$')
|
const checkForTwelveRegExp = new RegExp('^[0-9a-fA-F]{12}$')
|
||||||
@@ -41,8 +42,17 @@ export const show = asyncHandler(async (req, res, next) => {
|
|||||||
*/
|
*/
|
||||||
export const create = asyncHandler(async (req, res, next) => {
|
export const create = asyncHandler(async (req, res, next) => {
|
||||||
let oldGame
|
let oldGame
|
||||||
req.body.steamId.length > 0
|
const steamId = normalizeSteamId(req.body.steamId)
|
||||||
? (oldGame = await Game.findOne({ steamId: req.body.steamId }))
|
if (steamId === null)
|
||||||
|
return next(
|
||||||
|
new ErrorResponse(
|
||||||
|
'Enter a Steam app ID or a store.steampowered.com URL.',
|
||||||
|
400,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
req.body.steamId = steamId
|
||||||
|
steamId.length > 0
|
||||||
|
? (oldGame = await Game.findOne({ steamId }))
|
||||||
: (oldGame = await Game.findOne({ title: req.body.title }))
|
: (oldGame = await Game.findOne({ title: req.body.title }))
|
||||||
|
|
||||||
if (oldGame)
|
if (oldGame)
|
||||||
@@ -56,6 +66,14 @@ export const create = asyncHandler(async (req, res, next) => {
|
|||||||
const data =
|
const data =
|
||||||
req.body.scrape === true ? await steamScraper(req.body) : req.body
|
req.body.scrape === true ? await steamScraper(req.body) : req.body
|
||||||
|
|
||||||
|
if (
|
||||||
|
req.body.scrape === true &&
|
||||||
|
(!data || typeof data !== 'object' || !data.title || !data.frontImage)
|
||||||
|
)
|
||||||
|
return next(
|
||||||
|
new ErrorResponse('Steam lookup failed for that ID/URL.', 400)
|
||||||
|
)
|
||||||
|
|
||||||
if (req.body.scrape === false) {
|
if (req.body.scrape === false) {
|
||||||
if (req.body.shortDesc && isValid(req.body.shortDesc)) req.body.shortDesc = decode(req.body.shortDesc)
|
if (req.body.shortDesc && isValid(req.body.shortDesc)) req.body.shortDesc = decode(req.body.shortDesc)
|
||||||
if (req.body.reviews && isValid(req.body.reviews)) req.body.reviews = decode(req.body.reviews)
|
if (req.body.reviews && isValid(req.body.reviews)) req.body.reviews = decode(req.body.reviews)
|
||||||
@@ -96,6 +114,17 @@ export const update = asyncHandler(async (req, res, next) => {
|
|||||||
|
|
||||||
|
|
||||||
req.body.lastModifiedBy = req.user.id
|
req.body.lastModifiedBy = req.user.id
|
||||||
|
if (req.body.steamId !== undefined) {
|
||||||
|
const normalizedSteamId = normalizeSteamId(req.body.steamId)
|
||||||
|
if (normalizedSteamId === null)
|
||||||
|
return next(
|
||||||
|
new ErrorResponse(
|
||||||
|
'Enter a Steam app ID or a store.steampowered.com URL.',
|
||||||
|
400,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
req.body.steamId = normalizedSteamId
|
||||||
|
}
|
||||||
if (req.body.shortDesc && isValid(req.body.shortDesc)) req.body.shortDesc = decode(req.body.shortDesc)
|
if (req.body.shortDesc && isValid(req.body.shortDesc)) req.body.shortDesc = decode(req.body.shortDesc)
|
||||||
if (req.body.reviews && isValid(req.body.reviews)) req.body.reviews = decode(req.body.reviews)
|
if (req.body.reviews && isValid(req.body.reviews)) req.body.reviews = decode(req.body.reviews)
|
||||||
if (req.body.summary && isValid(req.body.summary)) req.body.summary = decode(req.body.summary)
|
if (req.body.summary && isValid(req.body.summary)) req.body.summary = decode(req.body.summary)
|
||||||
@@ -109,6 +138,14 @@ export const update = asyncHandler(async (req, res, next) => {
|
|||||||
const data =
|
const data =
|
||||||
req.body.scrape === true ? await steamScraper(req.body) : req.body
|
req.body.scrape === true ? await steamScraper(req.body) : req.body
|
||||||
|
|
||||||
|
if (
|
||||||
|
req.body.scrape === true &&
|
||||||
|
(!data || typeof data !== 'object' || !data.title || !data.frontImage)
|
||||||
|
)
|
||||||
|
return next(
|
||||||
|
new ErrorResponse('Steam lookup failed for that ID/URL.', 400)
|
||||||
|
)
|
||||||
|
|
||||||
game = await Game.findOneAndUpdate({ [gameId]: id }, data, {
|
game = await Game.findOneAndUpdate({ [gameId]: id }, data, {
|
||||||
new: true,
|
new: true,
|
||||||
runValidators: true,
|
runValidators: true,
|
||||||
|
|||||||
+18
-4
@@ -4,6 +4,7 @@ import Game from "../models/Game.js";
|
|||||||
import steamScraper from "../scripts/scraper.js";
|
import steamScraper from "../scripts/scraper.js";
|
||||||
import asyncHandler from "../middleware/async.js";
|
import asyncHandler from "../middleware/async.js";
|
||||||
import ErrorResponse from "../utils/errorResponse.js";
|
import ErrorResponse from "../utils/errorResponse.js";
|
||||||
|
import normalizeSteamId from "../utils/normalizeSteamId.js";
|
||||||
import { decode, isValid } from "js-base64";
|
import { decode, isValid } from "js-base64";
|
||||||
|
|
||||||
const checkForHexRegExp = new RegExp("^[0-9a-fA-F]{24}$");
|
const checkForHexRegExp = new RegExp("^[0-9a-fA-F]{24}$");
|
||||||
@@ -77,11 +78,16 @@ export const show = asyncHandler(async (req, res, next) => {
|
|||||||
*/
|
*/
|
||||||
export const create = asyncHandler(async (req, res, next) => {
|
export const create = asyncHandler(async (req, res, next) => {
|
||||||
let oldGame;
|
let oldGame;
|
||||||
let steamId;
|
|
||||||
|
|
||||||
if (req.body.steamId.includes("store.steampowered.com"))
|
const steamId = normalizeSteamId(req.body.steamId);
|
||||||
steamId = req.body.steamId.match(/\d+/)[0];
|
if (steamId === null)
|
||||||
else steamId = req.body.steamId;
|
return next(
|
||||||
|
new ErrorResponse(
|
||||||
|
"Enter a Steam app ID or a store.steampowered.com URL.",
|
||||||
|
400,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
req.body.steamId = steamId;
|
||||||
|
|
||||||
if (req.body.shortDesc && isValid(req.body.shortDesc))
|
if (req.body.shortDesc && isValid(req.body.shortDesc))
|
||||||
req.body.shortDesc = decode(req.body.shortDesc);
|
req.body.shortDesc = decode(req.body.shortDesc);
|
||||||
@@ -166,6 +172,14 @@ export const create = asyncHandler(async (req, res, next) => {
|
|||||||
const data =
|
const data =
|
||||||
req.body.scrape === true ? await steamScraper(req.body) : req.body;
|
req.body.scrape === true ? await steamScraper(req.body) : req.body;
|
||||||
|
|
||||||
|
if (
|
||||||
|
req.body.scrape === true &&
|
||||||
|
(!data || typeof data !== "object" || !data.title || !data.frontImage)
|
||||||
|
)
|
||||||
|
return next(
|
||||||
|
new ErrorResponse("Steam lookup failed for that ID/URL.", 400),
|
||||||
|
);
|
||||||
|
|
||||||
const game = await Game.create(data);
|
const game = await Game.create(data);
|
||||||
|
|
||||||
res.status(200).json({
|
res.status(200).json({
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
/**
|
||||||
|
* normalizeSteamId()
|
||||||
|
*
|
||||||
|
* @description Accepts either a plain numeric Steam app ID or a
|
||||||
|
* store.steampowered.com URL and returns the numeric app ID.
|
||||||
|
* Returns "" when the input is empty/missing (manual non-scrape flow
|
||||||
|
* looks games up by title instead) and `null` when the input is
|
||||||
|
* neither digits nor a recognized Steam Store URL.
|
||||||
|
*/
|
||||||
|
const normalizeSteamId = (value) => {
|
||||||
|
const raw = String(value ?? "").trim();
|
||||||
|
if (!raw) return "";
|
||||||
|
|
||||||
|
const urlMatch = raw.match(
|
||||||
|
/store\.steampowered\.com\/(?:agecheck\/)?app\/(\d+)/,
|
||||||
|
);
|
||||||
|
if (urlMatch) return urlMatch[1];
|
||||||
|
|
||||||
|
if (/^\d+$/.test(raw)) return raw;
|
||||||
|
|
||||||
|
return null;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default normalizeSteamId;
|
||||||
Reference in New Issue
Block a user