MickSlash
/
F95API
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Format code with prettier 

This commit fixes the style issues introduced in 611729a according to the output
from prettier.

Details: https://deepsource.io/gh/MillenniumEarl/F95API/transform/e85ee086-383c-4d69-b8e4-1d96a62a2790/
pull/35/head
deepsource-autofix[bot] 2020-10-21 13:33:20 +00:00 committed by GitHub
parent 611729a761
commit c789b1f4ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/index.js
View File

@ -114,7 +114,9 @@ module.exports.login = async function (username, password) {
} }
// Else, log in throught browser // Else, log in throught browser
shared.logger.info("No saved sessions or expired session, login on the platform"); shared.logger.info(
"No saved sessions or expired session, login on the platform"
);
if (_browser === null && !shared.isolation) _browser = await prepareBrowser(); if (_browser === null && !shared.isolation) _browser = await prepareBrowser();
const browser = shared.isolation ? await prepareBrowser() : _browser; const browser = shared.isolation ? await prepareBrowser() : _browser;
@ -267,7 +269,8 @@ module.exports.getGameDataFromURL = async function (url) {
// Check URL // Check URL
const exists = await urlHelper.urlExists(url); const exists = await urlHelper.urlExists(url);
if (!exists) throw new URIError(url + " is not a valid URL"); if (!exists) throw new URIError(url + " is not a valid URL");
if (!urlHelper.isF95URL(url)) throw new Error(url + " is not a valid F95Zone URL"); if (!urlHelper.isF95URL(url))
throw new Error(url + " is not a valid F95Zone URL");
// Gets the search results of the game being searched for // Gets the search results of the game being searched for
if (_browser === null && !shared.isolation) _browser = await prepareBrowser(); if (_browser === null && !shared.isolation) _browser = await prepareBrowser();
@ -393,7 +396,9 @@ function isCookieExpired(cookie) {
const expirationDate = new Date(expirationUnixTimestamp * 1000); const expirationDate = new Date(expirationUnixTimestamp * 1000);
if (expirationDate < Date.now()) { if (expirationDate < Date.now()) {
shared.logger.warn("Cookie " + cookie.name + " expired, you need to re-authenticate"); shared.logger.warn(
"Cookie " + cookie.name + " expired, you need to re-authenticate"
);
expiredCookies = true; expiredCookies = true;
} }
} }
@ -506,10 +511,9 @@ async function loginF95(browser, username, password) {
const errorMessageExists = await page.evaluate( const errorMessageExists = await page.evaluate(
/* istanbul ignore next */ /* istanbul ignore next */
(selector) => (selector) => document.querySelector(selector) !== null,
document.querySelector(selector) !== null,
selectorK.LOGIN_MESSAGE_ERROR selectorK.LOGIN_MESSAGE_ERROR
) );
// Save cookies to avoid re-auth // Save cookies to avoid re-auth
if (success) { if (success) {
@ -525,7 +529,10 @@ async function loginF95(browser, username, password) {
if (errorMessage === "Incorrect password. Please try again.") { if (errorMessage === "Incorrect password. Please try again.") {
message = "Incorrect password"; message = "Incorrect password";
} else if (errorMessage ==='The requested user \'' + username + '\' could not be found.') { } else if (
errorMessage ===
"The requested user '" + username + "' could not be found."
) {
// The escaped quotes are important! // The escaped quotes are important!
message = "Incorrect username"; message = "Incorrect username";
} else message = errorMessage; } else message = errorMessage;

15
test/index-test.js
View File

@ -171,7 +171,7 @@ describe("Search game data", function () {
const result = await F95API.getGameData("Kingdom of Deception", false); const result = await F95API.getGameData("Kingdom of Deception", false);
expect(result, "Without being logged should return null").to.be.null; expect(result, "Without being logged should return null").to.be.null;
}); });
it("Test game serialization", function() { it("Test game serialization", function () {
const json = JSON.stringify(testGame); const json = JSON.stringify(testGame);
const parsedGameInfo = JSON.parse(json); const parsedGameInfo = JSON.parse(json);
expect(parsedGameInfo).to.be.equal(testGame); expect(parsedGameInfo).to.be.equal(testGame);
@ -257,15 +257,22 @@ describe("Test url-helper", function () {
expect(exists).to.be.false; expect(exists).to.be.false;
// Now check for more specific URLs (with redirect)... // Now check for more specific URLs (with redirect)...
exists = urlHelper.urlExists("https://f95zone.to/threads/perverted-education-v0-9601-april-ryan.1854/"); exists = urlHelper.urlExists(
"https://f95zone.to/threads/perverted-education-v0-9601-april-ryan.1854/"
);
expect(exists).to.be.true; expect(exists).to.be.true;
exists = urlHelper.urlExists("https://f95zone.to/threads/perverted-education-v0-9601-april-ryan.1854/", true); exists = urlHelper.urlExists(
"https://f95zone.to/threads/perverted-education-v0-9601-april-ryan.1854/",
true
);
expect(exists).to.be.false; expect(exists).to.be.false;
}); });
it("Check if URL belong to the platform", async function () { it("Check if URL belong to the platform", async function () {
let belong = urlHelper.isF95URL("https://f95zone.to/threads/perverted-education-v0-9601-april-ryan.1854/"); let belong = urlHelper.isF95URL(
"https://f95zone.to/threads/perverted-education-v0-9601-april-ryan.1854/"
);
expect(belong).to.be.true; expect(belong).to.be.true;
belong = urlHelper.isF95URL("https://www.google/"); belong = urlHelper.isF95URL("https://www.google/");