From c4e25cc5c09c37f9769413601faf7591713c636b Mon Sep 17 00:00:00 2001 From: Ashley Date: Mon, 28 Feb 2022 20:33:58 +0300 Subject: [PATCH] Update server.js --- server.js | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/server.js b/server.js index 76e689fa..e996d7c3 100644 --- a/server.js +++ b/server.js @@ -1,3 +1,19 @@ +/* + Copyright (C) 2021-2022 POKETUBE & LIGTHTUBE CONTRUBUTORS (https://gitlab.com/kuylar/lighttube,https://github.com/iamashley0/poketube.) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see https://www.gnu.org/licenses/. + */ const path = require("path"); const templateDir = path.resolve(`${process.cwd()}${path.sep}html`); var express = require("express"); @@ -12,29 +28,7 @@ const renderTemplate = async (res, req, template, data = {}) => { ); }; const fetch = require("node-fetch"); -app.get("/watchnew", async function (req, res) { - var url = req.query.v; - var uu = `https://www.youtube.com/watch?v=${url}`; - - var opts = { - maxResults: 1, - key: process.env.yt, - }; - - const json = await fetch( - `https://yt-proxy-api.herokuapp.com/get_player_info?v=${url}` - ).then((res) => res.json()); - - const lyrics = await lyricsFinder(json.title); - if (lyrics == undefined) lyrics = "Lyrics not found"; - renderTemplate(res, req, "youtubenew.ejs", { - url: json.formats[1].url, - title: json, - video: json, - date: json.upload_date, - lyrics: lyrics.replace(/\n/g, "
"), - }); -}); + app.get("/watch", async function (req, res) { var url = req.query.v; var uu = `https://www.youtube.com/watch?v=${url}`; @@ -43,10 +37,11 @@ app.get("/watch", async function (req, res) { maxResults: 1, key: process.env.yt, }; - + //https://gitlab.com/kuylar/lighttube/-/blob/master/YTProxy/Models/YoutubePlayer.cs const json = await fetch( `https://yt-proxy-api.herokuapp.com/get_player_info?v=${url}` ).then((res) => res.json()); + //https://gitlab.com/kuylar/lighttube/-/blob/master/YTProxy/Youtube.cs const newapi = await fetch( `https://yt-proxy-api.herokuapp.com/video?v=${url}` ).then((res) => res.json());