From 5bed2dba4e4bfc0a8aa9344fd6dad29c268da9f1 Mon Sep 17 00:00:00 2001 From: Ashley Date: Thu, 10 Nov 2022 14:27:26 +0100 Subject: [PATCH] fix a silly issue :3 --- src/libpoketube/init/pages-404-and-main.js | 133 +++++++++++---------- 1 file changed, 71 insertions(+), 62 deletions(-) diff --git a/src/libpoketube/init/pages-404-and-main.js b/src/libpoketube/init/pages-404-and-main.js index a869c82f..9d21046a 100644 --- a/src/libpoketube/init/pages-404-and-main.js +++ b/src/libpoketube/init/pages-404-and-main.js @@ -1,4 +1,13 @@ - const { fetcher,core, wiki,musicInfo, modules, version, initlog, init,} = require("../libpoketube-initsys.js"); +const { + fetcher, + core, + wiki, + musicInfo, + modules, + version, + initlog, + init, +} = require("../libpoketube-initsys.js"); const { IsJsonString, convert, @@ -12,71 +21,71 @@ const { const sha384 = modules.hash; module.exports = function (app, config, renderTemplate) { - app.get("/:v*?", async function (req, res) { - let rendermainpage = () => { - if (req.useragent.isMobile) { - return res.redirect(`/discover`); - } else { - return renderTemplate(res, req, "landing.ejs"); + app.get("/discover", async function (req, res) { + const trends = await modules.fetch(config.tubeApi + `trending`); + const h = await trends.text(); + const k = JSON.parse(modules.toJson(h)); + + if (req.query.tab) + var tab = `/?type=${capitalizeFirstLetter(req.query.tab)}`; + + if (!req.query.tab) var tab = ""; + + const invtrend = await modules + .fetch(`https://vid.puffyan.us/api/v1/trending${tab}`) + .then((res) => res.text()); + + const t = JSON.parse(invtrend); + + if (req.query.mobilesearch) { + var query = req.query.mobilesearch; + tab = "search"; + if (req.query.continuation) { + var continuation = req.query.continuation; + } + if (!req.query.continuation) { + var continuation = ""; + } + + const search = await modules.fetch( + `https://tube.kuylar.dev/api/search?query=${query}&continuation=${continuation}` + ); + + const text = await search.text(); + var j = JSON.parse(modules.toJson(text)); } - }; - if (req.params.v) { - const isvld = await core.isvalidvideo(req.params.v); + renderTemplate(res, req, "main.ejs", { + k: k, + tab: req.query.tab, + isMobile: req.useragent.isMobile, + mobilesearch: req.query.mobilesearch, + inv: t, + turntomins, + continuation, + j, + }); + }); - if (isvld) { - return res.redirect(`/watch?v=${req.params.v}`); + app.get("/:v*?", async function (req, res) { + let rendermainpage = () => { + if (req.useragent.isMobile) { + return res.redirect(`/discover`); + } else { + return renderTemplate(res, req, "landing.ejs"); + } + }; + + if (req.params.v) { + const isvld = await core.isvalidvideo(req.params.v); + + if (isvld) { + return res.redirect(`/watch?v=${req.params.v}`); + } else { + return rendermainpage(); + } } else { return rendermainpage(); } - } else { - return rendermainpage(); - } -}); - -app.get("/discover", async function (req, res) { - const trends = await modules.fetch(config.tubeApi + `trending`); - const h = await trends.text(); - const k = JSON.parse(modules.toJson(h)); - - if (req.query.tab) var tab = `/?type=${capitalizeFirstLetter(req.query.tab)}`; - - if (!req.query.tab) var tab = ""; - - const invtrend = await modules - .fetch(`https://vid.puffyan.us/api/v1/trending${tab}`) - .then((res) => res.text()); - - const t = JSON.parse(invtrend); - - if (req.query.mobilesearch) { - var query = req.query.mobilesearch; - tab = "search"; - if (req.query.continuation) { - var continuation = req.query.continuation; - } - if (!req.query.continuation) { - var continuation = ""; - } - - const search = await modules.fetch( - `https://tube.kuylar.dev/api/search?query=${query}&continuation=${continuation}` - ); - - const text = await search.text(); - var j = JSON.parse(modules.toJson(text)); - } - - renderTemplate(res, req, "main.ejs", { - k: k, - tab: req.query.tab, - isMobile: req.useragent.isMobile, - mobilesearch: req.query.mobilesearch, - inv: t, - turntomins, - continuation, - j, }); -}); - -} \ No newline at end of file +};