big rewrite

server.js

@@ -14,18 +14,26 @@
     You should have received a copy of the GNU General Public License
     along with this program. If not, see https://www.gnu.org/licenses/.
   */
+
+///////// definitions /////////////////
 const path = require("path");
 const htmlParser = require("node-html-parser");
+const getColors = require("get-image-colors");
+
 const moment = require("moment");
+const lyricsFinder = require("./src/lyrics.js");
+const fetch = require("node-fetch");
+
+const { toJson } = require("xml2json");
+const fetcher = require("./src/fetcher.js");
 const templateDir = path.resolve(`${process.cwd()}${path.sep}html`);
+
 var express = require("express");
 var app = express();
 app.engine("html", require("ejs").renderFile);
 app.use(express.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
-const getColors = require("get-image-colors");
 
 app.set("view engine", "html");
-const lyricsFinder = require("./src/lyrics.js");
 const renderTemplate = async (res, req, template, data = {}) => {
   res.render(
     path.resolve(`${templateDir}${path.sep}${template}`),
@@ -45,50 +53,59 @@ const random_words = [
   "Minecraft movie trailer",
 ];
 
-const fetch = require("node-fetch");
-const { toJson } = require("xml2json");
-const fetcher = require("./src/fetcher.js");
-
 /*
 this is our config file,you can change stuff here
 */
-
 const config = {
   tubeApi: "https://tube.kuylar.dev/api/",
   dislikes: "https://returnyoutubedislikeapi.com/votes?videoId=",
   t_url: "https://t.poketube.fun/", //  def matomo url
 };
 
+// pages 
+
 app.get("/watch", async function (req, res) {
+  /*
+   * QUERYS
+   * v = Video ID
+   * e = Embed
+   * r = Recommended videos
+   * f = Recent videos from channel
+   * t = Piwik OptOut
+   */
   var v = req.query.v;
   var e = req.query.e;
   var r = req.query.r;
   var f = req.query.f;
   var t = req.query.t;
+
   const video = await fetch(config.tubeApi + `video?v=${v}`);
- 
+  var fetching = await fetcher(v);
+
+  const json = fetching.video.Player;
   const h = await video.text();
   const k = JSON.parse(toJson(h));
   if (!v) res.redirect("/");
-  var fetching = await fetcher(v);
+
+  // video
   const j = fetching.video.Player.Formats.Format,
     j_ = Array.isArray(j) ? j[j.length - 1] : j;
   let url;
   if (j_.URL != undefined) url = j_.URL;
-  const json = fetching.video.Player;
+
+  // channel info
   const engagement = fetching.engagement;
-  const channel = await fetch(
+  const channel = await fetch(config.tubeApi + `channel?id=${json.Channel.id}&tab=videos`);
-    config.tubeApi + `channel?id=${json.Channel.id}&tab=videos`
-  );
   const c = await channel.text();
   const tj = JSON.parse(toJson(c));
+
+  // lyrics
   const lyrics = await lyricsFinder(json.Title);
   if (lyrics == undefined) lyrics = "Lyrics not found";
+
   renderTemplate(res, req, "poketube.ejs", {
     url: url,
-    color: await getColors(
+    color: await getColors(`https://i.ytimg.com/vi/${v}/maxresdefault.jpg`).then((colors) => colors[0].hex()),
-      `https://i.ytimg.com/vi/${v}/maxresdefault.jpg`
-    ).then((colors) => colors[0].hex()),
     engagement: engagement,
     video: json,
     date: moment(k.Video.uploadDate).format("LL"),
@@ -106,15 +123,19 @@ app.get("/watch", async function (req, res) {
 app.get("/download", async function (req, res) {
   var v = req.query.v;
 
+  // video
   const video = await fetch(config.tubeApi + `video?v=${v}`);
   const h = await video.text();
   const k = JSON.parse(toJson(h));
+
   if (!v) res.redirect("/");
+
   var fetching = await fetcher(v);
   const j = fetching.video.Player.Formats.Format,
     j_ = Array.isArray(j) ? j[j.length - 1] : j;
   let url;
   if (j_.URL != undefined) url = j_.URL;
+
   const json = fetching.video.Player;
   const engagement = fetching.engagement;
 
@@ -124,44 +145,7 @@ app.get("/download", async function (req, res) {
     k: k,
     video: json,
     date: k.Video.uploadDate,
-    color: await getColors(
+    color: await getColors(`https://i.ytimg.com/vi/${v}/maxresdefault.jpg`).then((colors) => colors[0].hex())
-      `https://i.ytimg.com/vi/${v}/maxresdefault.jpg`
-    ).then((colors) => colors[0].hex()),
-  });
-});
-
-app.get("/music", async function (req, res) {
-  var v = req.query.v;
-  var e = req.query.e;
-  var r = req.query.r;
-  var t = req.query.t;
-  const video = await fetch(config.tubeApi + `video?v=${v}`);
-  const h = await video.text();
-  const k = JSON.parse(toJson(h));
-  if (!v) res.redirect("/");
-  var fetching = await fetcher(v);
-  const j = fetching.video.Player.Formats.Format,
-    j_ = Array.isArray(j) ? j[j.length - 1] : j;
-  let url;
-  if (j_.URL != undefined) url = j_.URL;
-  const json = fetching.video.Player;
-  const engagement = fetching.engagement;
-  const lyrics = await lyricsFinder(json.Title);
-  if (lyrics == undefined) lyrics = "Lyrics not found";
-  renderTemplate(res, req, "poketube-music.ejs", {
-    url: url,
-    color: await getColors(
-      `https://i.ytimg.com/vi/${v}/maxresdefault.jpg`
-    ).then((colors) => colors[0].hex()),
-    engagement: engagement,
-    video: json,
-    date: moment(k.Video.uploadDate).format("LL"),
-    e: e,
-    k: k,
-    r: r,
-    t: config.t_url,
-    optout: t,
-    lyrics: lyrics.replace(/\n/g, " <br> "),
   });
 });
 
@@ -185,11 +169,12 @@ app.get("/old/watch", async function (req, res) {
     ).then((colors) => colors[0].hex()),
     engagement: engagement,
     video: json,
-    date: moment(json.uploadDate).format("LL"),
+    date: "", //return ""
     e: e,
     lyrics: lyrics.replace(/\n/g, " <br> "),
   });
 });
+
 app.get("/discover", async function (req, res) {
   const trends = await fetch(config.tubeApi + `trending`);
   const h = await trends.text();
@@ -198,15 +183,20 @@ app.get("/discover", async function (req, res) {
     k: k,
   });
 });
+
 app.get("/channel", async (req, res) => {
   const ID = req.query.id;
-  const { toJson } = require("xml2json");
+
+  // about
   const bout = await fetch(config.tubeApi + `channel?id=${ID}&tab=about`);
   const h = await bout.text();
   const k = JSON.parse(toJson(h));
+
+  //videos
   const channel = await fetch(config.tubeApi + `channel?id=${ID}&tab=videos`);
   const c = await channel.text();
   const tj = JSON.parse(toJson(c));
+
   const { Subscribers: subscribers } = k.Channel.Metadata;
   renderTemplate(res, req, "channel.ejs", {
     ID: ID,
@@ -240,31 +230,37 @@ app.get("/api/search", async (req, res) => {
 app.get("/search", async (req, res) => {
   const { toJson } = require("xml2json");
   const query = req.query.query;
-  const search = await fetch(
+  const search = await fetch(`https://tube.kuylar.dev/api/search?query=${query}` );
-    `https://tube.kuylar.dev/api/search?query=${query}`
+
-  );
   const text = await search.text();
   const j = JSON.parse(toJson(text));
+
   if (!query) {
     return res.redirect("/");
   }
+
   renderTemplate(res, req, "search.ejs", {
     j: j,
     q: query,
   });
 });
+
 app.get("/css/:id", (req, res) => {
   res.sendFile(__dirname + `/css/${req.params.id}`);
 });
+
 app.get("/js/:id", (req, res) => {
   res.sendFile(__dirname + `/js/${req.params.id}`);
 });
+
 app.get("/video/upload", (req, res) => {
   res.redirect("https://youtube.com/upload?from=poketube_utc");
 });
+
 app.get("/", async function (req, res) {
   res.redirect("/discover");
 });
+
 app.get("/api/video/download", async function (req, res) {
   var v = req.query.v;
   var fetching = await fetcher(v);
@@ -285,6 +281,6 @@ app.get("*", function (req, res) {
   });
 });
 
-//
+// listen
 
 app.listen("3000", () => {});