fix issues :3

This commit is contained in:
Ashley 2023-02-25 17:45:15 +00:00
parent 03755a8e3b
commit 6e79f2f285

View file

@ -1,4 +1,4 @@
const { const {
fetcher, fetcher,
core, core,
wiki, wiki,
@ -66,130 +66,114 @@ module.exports = function (app, config, renderTemplate) {
app.get("/search", async (req, res) => { app.get("/search", async (req, res) => {
const query = req.query.query; const query = req.query.query;
if (req.query.continuation) {
var continuation = req.query.continuation;
}
if (!req.query.continuation) {
var continuation = "";
}
if (!query) { if (!query) {
return res.redirect("/"); return res.redirect("/");
} }
if (query) { let continuation = req.query.continuation || "";
try {
const search = await modules.fetch(
`https://tube-srv.ashley143.gay/api/search?query=${query.replace(
"&",
"and"
)}&continuation=${continuation}`
);
const text = await search.text(); try {
const j = JSON.parse(modules.toJson(text)); const searchUrl = `https://tube-srv.ashley143.gay/api/search?query=${encodeURIComponent(
query
)}&continuation=${encodeURIComponent(continuation)}`;
const searchResponse = await modules.fetch(searchUrl);
const searchText = await searchResponse.text();
const searchJson = JSON.parse(modules.toJson(searchText));
h = " "; let didYouMean;
if (
searchJson.Search?.Results?.DynamicItem?.id === "didYouMeanRenderer"
) {
didYouMean = JSON.parse(searchJson.Search.Results.DynamicItem.Title);
}
// YOUTUBE WHY do you WANT me to do this oh ma gosh const summary = await wiki.summary(query + " ").then((summary_) =>
if (j.Search) {
if ("Results.DynamicItem" in j.Search) {
if (j.Search.Results.DynamicItem.id == "didYouMeanRenderer") {
var h = JSON.parse(j.Search.Results.DynamicItem.Title);
}
}
}
const summary = await wiki
.summary(query + " ")
.then((summary_) =>
summary_.title !== "Not found." ? summary_ : "none" summary_.title !== "Not found." ? summary_ : "none"
); );
renderTemplate(res, req, "search.ejs", { renderTemplate(res, req, "search.ejs", {
j, j: searchJson,
h, h: didYouMean,
continuation, continuation,
q: query, q: query,
summary, summary,
}); });
} catch { } catch (error) {
res.redirect("/"); console.error(`Error while searching for '${query}':`, error);
} res.redirect("/");
} }
}); });
app.get("/channel/", async (req, res) => { app.get("/channel/", async (req, res) => {
try {
const ID = req.query.id;
const tab = req.query.tab;
try { try {
// about const ID = req.query.id;
const bout = await modules.fetch( const tab = req.query.tab;
config.tubeApi + `channel?id=${ID}&tab=about`
);
const h = await bout.text();
var boutJson = JSON.parse(modules.toJson(h));
} catch {
boutJson = " ";
}
const continuation = req.query.continuation || "";
const continuationl = req.query.continuationl || "";
const continuations = req.query.continuations || "";
const sort_by = req.query.sort_by || "newest";
const getChannelData = async (url) => {
try { try {
const response = await modules.fetch(url); // about
return JSON.parse(await response.text()); const bout = await modules.fetch(
} catch (error) { config.tubeApi + `channel?id=${ID}&tab=about`
console.error("Failed to fetch channel data from API:", error); );
return null; const h = await bout.text();
var boutJson = JSON.parse(modules.toJson(h));
} catch {
boutJson = " ";
} }
const continuation = req.query.continuation || "";
const continuationl = req.query.continuationl || "";
const continuations = req.query.continuations || "";
const sort_by = req.query.sort_by || "newest";
const getChannelData = async (url) => {
try {
const response = await modules.fetch(url);
return JSON.parse(await response.text());
} catch (error) {
console.error("Failed to fetch channel data from API:", error);
return null;
}
};
const tj = await modules.fetch(`https://inv.zzls.xyz/api/v1/channels/videos/${ID}/?sort_by=${req.query.sort_by || "newest"}` + continuation).then((res) => res.text()).then((txt) => getJson(txt)).catch(" ")
const shorts = await modules.fetch(`https://inv.zzls.xyz/api/v1/channels/${ID}/shorts?sort_by=${req.query.sort_by || "newest"}` + continuations).then((res) => res.text()).then((txt) => getJson(txt)).catch(" ")
const stream = await modules.fetch(`https://inv.zzls.xyz/api/v1/channels/${ID}/streams?sort_by=${req.query.sort_by || "newest"}` + continuationl).then((res) => res.text()).then((txt) => getJson(txt)).catch(" ")
const c = await modules.fetch(`https://inv.zzls.xyz/api/v1/channels/community/${ID}/`).then((res) => res.text()) .then((txt) => getJson(txt));
const summary = await wiki.summary(boutJson.Channel.Metadata.Name);
const wikiSummary = summary.title !== "Not found." ? summary : "none";
const subscribers = boutJson.Channel.Metadata.Subscribers;
const about = boutJson.Channel.Contents.ItemSection.About;
const description = about.Description.toString().replace(/\n/g, " <br> ");
const dnoreplace = about.Description.toString();
renderTemplate(res, req, "channel.ejs", {
ID,
tab,
shorts,
j: boutJson,
sort: sort_by,
stream,
tj,
c,
convert,
turntomins,
dnoreplace,
continuation,
wiki: wikiSummary,
getFirstLine,
isMobile: req.useragent.isMobile,
about,
subs:
typeof subscribers === "string"
? subscribers.replace("subscribers", "")
: "None",
desc: dnoreplace === "[object Object]" ? "" : description,
});
} catch (error) {
console.error("Failed to render channel page:", error);
res.redirect("/");
} }
});
const [tj, shorts, stream, c] = await Promise.all([
getChannelData(`https://inv.zzls.xyz/api/v1/channels/videos/${ID}/?sort_by=${sort_by}&continuation=${continuation}`),
getChannelData(`https://inv.zzls.xyz/api/v1/channels/${ID}/shorts?sort_by=${sort_by}&continuation=${continuations}`),
getChannelData(`https://inv.zzls.xyz/api/v1/channels/${ID}/streams?sort_by=${sort_by}&continuation=${continuationl}`),
getChannelData(`https://inv.zzls.xyz/api/v1/channels/community/${ID}/`),
]);
const summary = await wiki.summary(boutJson.Channel.Metadata.Name);
const wikiSummary = summary.title !== "Not found." ? summary : "none";
const subscribers = boutJson.Channel.Metadata.Subscribers;
const about = boutJson.Channel.Contents.ItemSection.About;
const description = about.Description.toString().replace(/\n/g, " <br> ");
const dnoreplace = about.Description.toString();
renderTemplate(res, req, "channel.ejs", {
ID,
tab,
shorts,
j: boutJson,
sort: sort_by,
stream,
tj,
c,
convert,
turntomins,
dnoreplace,
continuation,
wiki: wikiSummary,
getFirstLine,
isMobile: req.useragent.isMobile,
about,
subs: typeof subscribers === "string" ? subscribers.replace("subscribers", "") : "None",
desc: dnoreplace === "[object Object]" ? "" : description,
});
} catch (error) {
console.error("Failed to render channel page:", error);
res.redirect("/");
}
});
}; };