From ab10587924b789c9aab2afde26e2658cf246a327 Mon Sep 17 00:00:00 2001
From: Cristiano Pires <cpires@labsxd.com>
Date: Thu, 16 Mar 2023 21:12:08 +0000
Subject: [PATCH] Allow multiple feeds on the same channel.

---
 commands/admin/setFeedId.js |  2 --
 controller/api.js           |  2 --
 lib.js                      | 14 ++++++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/commands/admin/setFeedId.js b/commands/admin/setFeedId.js
index 49d692f..7048aa7 100644
--- a/commands/admin/setFeedId.js
+++ b/commands/admin/setFeedId.js
@@ -96,8 +96,6 @@ class setYTFeed extends Command{
                                 return data.feed.author.name._text
                             }  
         if(!name) return {error:'Provided Youtube channel does not exist.'}   
-        const channelInUse = await feedM.findOne({ChannelId:channelId}).then(channel=>{return channel}).catch(()=>{return []});
-        if(channelInUse) return {error:'Discord channel already in use. Please choose another.'}
         return {YTChannelId, channelId, name, channelName:exists.name}
     }
     
diff --git a/controller/api.js b/controller/api.js
index 1cff5a5..68726e0 100644
--- a/controller/api.js
+++ b/controller/api.js
@@ -360,8 +360,6 @@ async function confirmArgs(args, bot)
                             })
                         .catch(error=>{return error;});
     if(!name) return {error:'Provided Youtube channel does not exist.'}   
-    const channelInUse = await feedsM.findOne({ChannelId:channelId}).then(channel=>{return channel}).catch(()=>{return []});
-    if(channelInUse) return {error:'Discord channel already in use. Please choose another.'}
     return {YTChannelId, channelId, name, channelName:exists.name}
 }
 exports.deleteFeed = (req,res) =>
diff --git a/lib.js b/lib.js
index 881d66c..6b69ac4 100644
--- a/lib.js
+++ b/lib.js
@@ -171,10 +171,6 @@ class _Client extends Client
     }
     async YTFeed()
     {
-        //TODO: Allow multiple feeds per channel 
-        //Rust: FacePunch and Shadowfrax
-        //!Needs some other element for comparison other than published date
-
         const feeds = await feedM.find().then(feeds=>{return feeds})
         if(feeds.length<1) return 
         for(var feed of feeds)
@@ -216,7 +212,7 @@ class _Client extends Client
                 if(!res) return false;
                 const channel = this.channels.cache.get(feed.ChannelId);
                 if(!channel) return false;
-                const lastSentMessage = await channel.messages.fetch().then(res=>
+                const lastSentMessage= await channel.messages.fetch().then(res=>
                     {
                         for(var item of res)
                         {
@@ -226,13 +222,15 @@ class _Client extends Client
                                 {
                                     var fields = item[1].embeds[0].fields.filter(x=>x.name === 'PublishedTimeStamp');
                                     var isFeed = fields.length>0;
-                                    if(isFeed) return fields[0].value
+                                    if(isFeed) return item[1].embeds[0];
                                 }
                             }
                         }
                     })
-                if(!lastSentMessage) sendMessage(res, feed, channel)
-                else if(lastSentMessage != res.published) sendMessage(res, feed, channel);
+                const lastSentMessagePublished = lastSentMessage.fields[0].value;
+                const lastSentMessageChannelURL = lastSentMessage.data.url
+                if(!lastSentMessagePublished) sendMessage(res, feed, channel)
+                else if(lastSentMessagePublished != res.published && lastSentMessageChannelURL == res.author.url) sendMessage(res, feed, channel);
             })(feed);
         }
         function sendMessage(res, feed, channel)