diff --git a/src/libpoketube/init/pages-404-and-main.js b/src/libpoketube/init/pages-404-and-main.js index 65ec6c34..854256ee 100644 --- a/src/libpoketube/init/pages-404-and-main.js +++ b/src/libpoketube/init/pages-404-and-main.js @@ -34,21 +34,18 @@ function getJson(str) { } module.exports = function (app, config, renderTemplate) { - app.get("/app", async function (req, res) { + app.get("/app", async function (req, res) { const { fetch } = await import("undici"); - // redirect mobiles to /app?tab=search - if (req.useragent && req.useragent.isMobile) { + if (req.useragent?.isMobile) { return res.redirect("/app?tab=search"); } - // no more trending fetch let tab = ""; if (req.query.tab) { tab = `/?type=${capitalizeFirstLetter(req.query.tab)}`; } - - // t is now empty string + const t = " "; const p = ""; @@ -58,15 +55,19 @@ module.exports = function (app, config, renderTemplate) { const normalizeSearchData = (data) => { if (!data) return { results: [] }; if (Array.isArray(data)) return { results: data }; - if (Array.isArray(data.results)) return { results: data.results, meta: data.meta || {} }; - if (Array.isArray(data.items)) return { results: data.items, meta: data.meta || {} }; - if (Array.isArray(data.videos)) return { results: data.videos, meta: data.meta || {} }; + if (Array.isArray(data.results)) + return { results: data.results, meta: data.meta || {} }; + if (Array.isArray(data.items)) + return { results: data.items, meta: data.meta || {} }; + if (Array.isArray(data.videos)) + return { results: data.videos, meta: data.meta || {} }; return { results: [], meta: { note: "unrecognized search payload shape" } }; }; try { const query = - (typeof req.query.mobilesearch === "string" && req.query.mobilesearch.trim()) ?? + (typeof req.query.mobilesearch === "string" && + req.query.mobilesearch.trim()) ?? (typeof req.query.query === "string" && req.query.query.trim()) ?? (typeof req.query.q === "string" && req.query.q.trim()) ?? ""; @@ -74,35 +75,39 @@ module.exports = function (app, config, renderTemplate) { const continuation = (req.query.continuation ?? "1").toString(); if (query) { - const searchUrl = `${config.invapi}/search?q=${encodeURIComponent(query)}&type=video&page=${encodeURIComponent( - continuation - )}`; + const searchUrl = `${config.invapi}/search?q=${encodeURIComponent( + query + )}&type=video&page=${encodeURIComponent(continuation)}`; - const resSearch = await fetch(searchUrl, { + const r = await fetch(searchUrl, { headers: { "User-Agent": config.useragent }, }); - if (!resSearch.ok) { + if (!r.ok) { j = { results: [], error: true, - meta: { status: resSearch.status, statusText: resSearch.statusText, url: searchUrl }, + meta: { status: r.status, statusText: r.statusText, url: searchUrl }, }; console.error("[mobilesearch] HTTP error", j.meta); } else { - const ct = resSearch.headers.get("content-type") || ""; + const ct = r.headers.get("content-type") || ""; let data; + if (ct.includes("application/json")) { - data = await resSearch.json(); + data = await r.json(); } else { - const txt = await resSearch.text(); + const txt = await r.text(); data = await Promise.resolve(getJson(txt)); } + j = normalizeSearchData(data); } } else { j = { results: [], error: true, meta: { reason: "missing query" } }; - console.warn("[mobilesearch] Missing query param (mobilesearch/q/query)"); + console.warn( + "[mobilesearch] Missing query parameter (mobilesearch/q/query)" + ); } j.meta = { ...(j.meta || {}), continuation }; @@ -110,7 +115,10 @@ module.exports = function (app, config, renderTemplate) { j = { results: [], error: true, - meta: { reason: "exception", message: String((err && err.message) || err) }, + meta: { + reason: "exception", + message: String((err && err.message) || err), + }, }; console.error("[mobilesearch] Exception:", err); }