diff --git a/app/index.js b/app/index.js index d87bdfd..cb5a413 100644 --- a/app/index.js +++ b/app/index.js @@ -383,7 +383,7 @@ function isCookieExpired(cookie) { let expiredCookies = false; // Ignore cookies that never expire - const expirationUnixTimestamp = cookie["expire"]; + const expirationUnixTimestamp = cookie.expire; if (expirationUnixTimestamp !== "-1") { // Convert UNIX epoch timestamp to normal Date @@ -392,7 +392,7 @@ function isCookieExpired(cookie) { if (expirationDate < Date.now()) { if (shared.debug) console.log( - "Cookie " + cookie["name"] + " expired, you need to re-authenticate" + "Cookie " + cookie.name + " expired, you need to re-authenticate" ); expiredCookies = true; } diff --git a/app/scripts/game-scraper.js b/app/scripts/game-scraper.js index 9b0f834..8276a7b 100644 --- a/app/scripts/game-scraper.js +++ b/app/scripts/game-scraper.js @@ -7,16 +7,10 @@ const puppeteer = require("puppeteer"); // skipcq: JS-0128 // Modules from file const shared = require("./shared.js"); const selectors = require("./constants/css-selectors.js"); -const { - preparePage -} = require("./puppeteer-helper.js"); +const { preparePage } = require("./puppeteer-helper.js"); const GameDownload = require("./classes/game-download.js"); const GameInfo = require("./classes/game-info.js"); -const { - isStringAValidURL, - isF95URL, - urlExists -} = require("./urls-helper.js"); +const { isStringAValidURL, isF95URL, urlExists } = require("./urls-helper.js"); /** * @protected @@ -60,12 +54,10 @@ module.exports.getGameInfo = async function (browser, url) { info.overview = overview; info.tags = await tags; info.f95url = url; - info.version = info.isMod ? - parsedInfos["MOD VERSION"] : - parsedInfos["VERSION"]; - info.lastUpdate = info.isMod ? - parsedInfos["UPDATED"] : - parsedInfos["THREAD UPDATED"]; + info.version = info.isMod ? parsedInfos["MOD VERSION"] : parsedInfos.VERSION; + info.lastUpdate = info.isMod + ? parsedInfos.UPDATED + : parsedInfos["THREAD UPDATED"]; info.previewSource = await previewSource; info.changelog = (await changelog) || "Unknown changelog"; //info.downloadInfo = await downloadData; @@ -155,8 +147,7 @@ async function getGameAuthor(page) { // Get the game/mod name (without square brackets) const titleHTML = await page.evaluate( /* istanbul ignore next */ - (selector) => - document.querySelector(selector).innerHTML, + (selector) => document.querySelector(selector).innerHTML, selectors.GAME_TITLE ); const structuredTitle = HTMLParser.parse(titleHTML); @@ -229,8 +220,7 @@ async function getGameTitle(page) { // Get the game/mod name (without square brackets) const titleHTML = await page.evaluate( /* istanbul ignore next */ - (selector) => - document.querySelector(selector).innerHTML, + (selector) => document.querySelector(selector).innerHTML, selectors.GAME_TITLE ); const structuredTitle = HTMLParser.parse(titleHTML); @@ -413,8 +403,8 @@ function extractGameHostingData(platform, text) { // Find the end of the container if (endIndex === -1) endIndex = - text.indexOf(CONTAINER_SPAN_CLOSE, startIndex) + - CONTAINER_SPAN_CLOSE.length; + text.indexOf(CONTAINER_SPAN_CLOSE, startIndex) + + CONTAINER_SPAN_CLOSE.length; text = text.substring(startIndex, endIndex);