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

Merge branch 'master' of https://github.com/MillenniumEarl/F95API into master

pull/34/head
MillenniumEarl 2020-10-21 08:32:41 +02:00
parent e6716e8f35 aece733a12
commit 3144f28849
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/index.js
View File

@ -485,7 +485,7 @@ async function loginF95(browser, username, password) {
page.waitForSelector(selectors.PASSWORD_INPUT), page.waitForSelector(selectors.PASSWORD_INPUT),
page.waitForSelector(selectors.LOGIN_BUTTON), page.waitForSelector(selectors.LOGIN_BUTTON),
]); ]);
await page.type(selectors.USERNAME_INPUT, username); // Insert username await page.type(selectors.USERNAME_INPUT, username); // Insert username
await page.type(selectors.PASSWORD_INPUT, password); // Insert password await page.type(selectors.PASSWORD_INPUT, password); // Insert password
await Promise.all([ await Promise.all([
@ -552,10 +552,10 @@ async function getUserWatchedGameThreads(browser) {
// Show the popup // Show the popup
await Promise.all([ await Promise.all([
page.click(selectors.WATCHED_THREAD_FILTER_POPUP_BUTTON), page.click(selectors.WATCHED_THREAD_FILTER_POPUP_BUTTON),
page.waitForSelector(selectors.UNREAD_THREAD_CHECKBOX), page.waitForSelector(selectors.UNREAD_THREAD_CHECKBOX),
page.waitForSelector(selectors.ONLY_GAMES_THREAD_OPTION), page.waitForSelector(selectors.ONLY_GAMES_THREAD_OPTION),
page.waitForSelector(selectors.FILTER_THREADS_BUTTON), page.waitForSelector(selectors.FILTER_THREADS_BUTTON),
]); ]);
// Set the filters // Set the filters
@ -564,7 +564,7 @@ async function getUserWatchedGameThreads(browser) {
document.querySelector(selector).removeAttribute("checked"), document.querySelector(selector).removeAttribute("checked"),
selectors.UNREAD_THREAD_CHECKBOX selectors.UNREAD_THREAD_CHECKBOX
); // Also read the threads already read ); // Also read the threads already read
// Filter the threads // Filter the threads
await Promise.all([ await Promise.all([
page.click(selectors.ONLY_GAMES_THREAD_OPTION), page.click(selectors.ONLY_GAMES_THREAD_OPTION),

3
app/scripts/game-scraper.js
View File

@ -24,7 +24,8 @@ module.exports.getGameInfo = async function (browser, url) {
if (shared.debug) console.log("Obtaining game info"); if (shared.debug) console.log("Obtaining game info");
// Verify the correctness of the URL // Verify the correctness of the URL
if (!urlsHelper.isF95URL(url)) throw new Error(url + " is not a valid F95Zone URL"); if (!urlsHelper.isF95URL(url))
throw new Error(url + " is not a valid F95Zone URL");
const exists = await urlsHelper.urlExists(url); const exists = await urlsHelper.urlExists(url);
if (!exists) return null; if (!exists) return null;

2
app/scripts/game-searcher.js
View File

@ -30,7 +30,7 @@ module.exports.getSearchGameResults = async function (browser, gamename) {
await Promise.all([ await Promise.all([
page.waitForSelector(selectors.SEARCH_FORM_TEXTBOX), page.waitForSelector(selectors.SEARCH_FORM_TEXTBOX),
page.waitForSelector(selectors.TITLE_ONLY_CHECKBOX), page.waitForSelector(selectors.TITLE_ONLY_CHECKBOX),
page.waitForSelector(selectors.SEARCH_BUTTON) page.waitForSelector(selectors.SEARCH_BUTTON),
]); ]);
await page.type(selectors.SEARCH_FORM_TEXTBOX, gamename); // Type the game we desire await page.type(selectors.SEARCH_FORM_TEXTBOX, gamename); // Type the game we desire

8
app/scripts/urls-helper.js
View File

@ -66,7 +66,7 @@ module.exports.urlExists = async function (url, checkRedirect) {
* @param {String} url URL to check for redirect * @param {String} url URL to check for redirect
* @returns {Promise<String>} Redirect URL or the passed URL * @returns {Promise<String>} Redirect URL or the passed URL
*/ */
module.exports.getUrlRedirect = async function(url) { module.exports.getUrlRedirect = async function (url) {
const response = await ky.head(url); const response = await ky.head(url);
return response.url; return response.url;
} };