From 183b162d915c877248323c4a986eac43f547387d Mon Sep 17 00:00:00 2001
From: Cristiano Pires <cpires@labsxd.com>
Date: Mon, 25 Sep 2023 22:12:57 +0100
Subject: [PATCH] Error handling -> Edge cases on youtube urls; house cleaning
 on routes

---
 controller/api.js      | 12 +++++++++++-
 lib.js                 | 27 +++++++++++++++++++++++++--
 public/js/dashboard.js | 10 +++++++---
 routes/routes.js       |  2 +-
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/controller/api.js b/controller/api.js
index 012933a..fc1b81e 100644
--- a/controller/api.js
+++ b/controller/api.js
@@ -326,7 +326,17 @@ exports.getChannelName = async (req,res)=>
 }
 exports.checkChannel = async (req, res)=>
 {
-    var isValid = await fetch('https://www.youtube.com/'+req.headers.id,
+    var url =  req.headers.id;
+    var regExp = '^(?:(?:https?:)?\/\/)?(?:www\.|(m\.)?)(youtube\.com|youtu\.be)(\/[^\s]*)?$';
+    var rE = new RegExp(regExp);
+    if (rE.test(url)) {
+        url = req.headers.id;
+    }
+    else
+    {
+        url = 'https://www.youtube.com/'+req.headers.id
+    }
+    var isValid = await fetch(url,
     {
         method: "GET",
         mode: "cors", 
diff --git a/lib.js b/lib.js
index d87c662..f732d06 100644
--- a/lib.js
+++ b/lib.js
@@ -213,7 +213,30 @@ class _Client extends Client
                 if(!res) return false;
                 const channel = this.channels.cache.get(feed.ChannelId);
                 if(!channel) return false;
-                // console.log('Res from',feed,res)
+                var ytChannelName = await fetch('https://www.youtube.com/feeds/videos.xml?channel_id='+feed.YTChannelId,
+                                        {
+                                            method: "GET",
+                                            mode: "cors", 
+                                        })
+                                        .then(response=>
+                                            {
+                                                if(response.ok) return response.text();
+                                            })
+                                        .then(data=>
+                                            {
+                                                data = xmlparser.xml2json(data,
+                                                    {
+                                                        compact: true,
+                                                        space: 4
+                                                    });
+                                                    data = JSON.parse(data);
+                                                return data.feed.author.name._text
+                                            })
+                                        .catch(error=>
+                                            {
+                                                return error;
+                                            });
+                // console.log('Lib: YTFeed:',ytChannelName, res.author.name, channel.name,feed.ChannelId ,channel.id)
                 var aux = res;
                 const lastSentMessage= await channel.messages.fetch().then(res=>
                     {
@@ -240,7 +263,7 @@ class _Client extends Client
         }
         function sendMessage(res, feed, channel)
         {
-            console.log('Lib, res on sendMessage method', res)
+            console.log('Lib: YTFeed: SendMessage: Res', res.author.name)
             const embed = new EmbedBuilder()
             embed.setFooter({text:'Rem-chan on ', iconURL:"https://i.imgur.com/g6FSNhL.png"})
             embed.setAuthor({name:"Rem-chan", iconURL:"https://i.imgur.com/g6FSNhL.png",url:'https://rem.wordfights.com/addtodiscord'}); 
diff --git a/public/js/dashboard.js b/public/js/dashboard.js
index 6ed17ae..c83aa27 100644
--- a/public/js/dashboard.js
+++ b/public/js/dashboard.js
@@ -511,7 +511,7 @@ async function _updateFeed(element)
     var YTchannelID = document.getElementById('YTchannelID').value;
     var CostumMessageI = document.getElementById('CostumMessageI').value;
     var YTValid = await channelCheck(YTchannelID); 
-    if(!YTValid) return document.getElementById('YTchannelID').style = "border: 2px solid red" //! COMPLETE THIS WITH A ERROR POPUP 
+    if(!YTValid) return handleWrongLink();
     fetch(`${window.location.origin}/api/addFeed`, 
     {
         method: "POST",
@@ -529,9 +529,13 @@ async function _updateFeed(element)
         else alert(res.error);  
     })
     .catch(console.error);
-
     
 }
+function handleWrongLink()
+{    
+    window.alert('Youtube channel not found, verify the link.')
+    return document.getElementById('YTchannelID').style = "border: 2px solid red" 
+}
 async function channelCheck(yt)
 {
     var res =  await fetch(`${window.location.origin}/api/checkChannel`, 
@@ -552,5 +556,5 @@ async function channelCheck(yt)
         {
             return error;
         });
-    return res=='true'?true:false;
+    return res
 }
\ No newline at end of file
diff --git a/routes/routes.js b/routes/routes.js
index 3098050..0662d37 100644
--- a/routes/routes.js
+++ b/routes/routes.js
@@ -22,7 +22,7 @@ module.exports = (io, bot)=>
     router.route('/dashboard').get(dash.get(io))
                               .post(dash.post(io));
     router.route('/getMessage').get(api.getMessage(bot));
-    router.route('/leagues').get(api.getTournamentPage);
+    //router.route('/leagues').get(api.getTournamentPage);
     router.route('/dc').get(homeController.dc);
     // This goes to electron
     // router.route('/league/:league').get(api.getLeaguePage);