diff --git a/src/logic.js b/src/logic.js index 4659b4f..1c0f6f9 100644 --- a/src/logic.js +++ b/src/logic.js @@ -252,15 +252,15 @@ const open_browser = async () => { return browser; }; -const has_upcoming_events = async (page) => - await page.evaluate( - 'let txt = document.querySelector("body").innerText;txt.includes("Upcoming events") && !txt.includes("not have any upcoming events")', - ); +const get_body_inner_text = async (page) => + await page.evaluate('document.querySelector("body").innerText;'); -const has_past_events = async (page) => - await page.evaluate( - 'let inner = document.querySelector("body").innerText;inner.includes("Past events") && !inner.includes("not have any past events")', - ); +const has_upcoming_events = (body) => + body.includes('upcoming events') && + !body.includes('not have any upcoming events'); + +const has_past_events = (body) => + body.includes('past events') && !body.includes('not have any past events'); const register_page_scraper = (endpoint, page, past_events = false) => { let responses = []; @@ -345,10 +345,10 @@ const get_page_events = async ( accept_buttons[0].click(); } - const past_resolved = - get_past_events && !(await has_past_events(facebook_page)); + const body_text = (await get_body_inner_text(facebook_page)).toLowerCase(); + const past_resolved = get_past_events && !has_past_events(body_text); const upcoming_resolved = - get_upcoming_events && !(await has_upcoming_events(facebook_page)); + get_upcoming_events && !has_upcoming_events(body_text); if (past_resolved) { past_events = Promise.resolve([]);