refactor all feed related into one function

commands/add.js

@@ -21,7 +21,6 @@ module.exports = {
         }
         
         var sources = libFlayer.getSources();  
-        //libFlayer.getConfig();
         libFlayer.loadFeeds();
 
 	}

commands/search.js

@@ -12,7 +12,6 @@ module.exports = {
 
         var search = args[0];
         var found = false;
-        message.reply('Searching for: ' + search);
     
         let i = 0;
         let iSave = 0
@@ -37,10 +36,6 @@ module.exports = {
             //message.channel.send('!get '+iSave);
         }
 
-        if (count > 0) {
-            message.channel.send(`Displayed results for: ${search}`);
-        }
-        
         if (!found) {
             message.reply(`No results found for: ${search}`);
         }

commands/update.js

@@ -4,8 +4,6 @@ module.exports = {
     name: 'update',
     description: 'Get RSS Source Link',
     execute(message, args) {
-        message.reply(`Updating Sources`);
-        libFlayer.getConfig();
         message.reply(`Loading Feeds from Sources`);
         libFlayer.loadFeeds();
         feedArray = libFlayer.getFeeds();

index.js

@@ -31,7 +31,6 @@ server.all("/",(req, res) => {
 function keepAlive() {
 	server.listen(PORT, () =>  {
 		console.log("Keep Alive Server Running");
-		libFlayer.getConfig();
         libFlayer.loadFeeds();
 		libFlayer.feedArray = libFlayer.getFeeds();
 	})
@@ -72,7 +71,9 @@ client.on('message', message => {
 console.log("Link Flayer Bot Activating");
 keepAlive();
 client.login(token);                    //Load Client Discord Token
-libFlayer.loadFeeds();                  //Load Configured Feeds
+
+libFlayer.loadFeeds();
+
 
 
 

libFlayer.js

@@ -81,29 +81,6 @@ exports.deleteSource = function(title) {
 
 exports.sleep = (ms) => new Promise((resolve) => { setTimeout(resolve, ms); })
 
-exports.loadFeeds = function() {
-    linkFlayerMap = [];
-    feeds.forEach(feedBlock => {
-        (async () => {
-            const feed = parser.parseURL(feedBlock.link, function(err, feed) {
-              if (err) throw err;
-              console.log(feed.title);
-              feed.items.forEach(item => {
-
-                var linkData = {
-                  title: `${item.title}`,
-                  link: `${item.link}`,
-                  category: `${feedBlock.category}`,
-                  id: record.getId()
-                }
-                linkFlayerMap.push(linkData);
-              });
-            }) 
-          })().then();
-    });
-
-}
-
 exports.getFeeds = function (feedType) {
   var linkFlayerFilteredMap = [];
     if (feedType == null || feedType == undefined || feedType == "") {
@@ -127,25 +104,57 @@ exports.getQuotes = function () {
   return quotes;
 }
 
-exports.getConfig = function() {
+exports.loadFeeds = function() {
   feeds = [];
   base(userTable)
             .select().eachPage(function page(records, fetchNextPage) {
-
+              try {
               records.forEach(function(record) {
                 console.log('Retrieved title: ', record.get('title'));
                 console.log('Retrieved link:', record.get('link'));
                 console.log('Retrieved category:', record.get('category'));
 
-                var linkData = {
+                var feedData = {
-                  title: `${record.get('title')}`,
+                  title: `${unescape(record.get('title'))}`,
-                  link: `${record.get('link')}`,
+                  link: `${unescape(record.get('link'))}`,
-                  category: `${record.get('category')}`
+                  category: `${unescape(record.get('category'))}`,
+                  id: record.getId()
                 }
 
-                feeds.push(linkData);
+                feeds.push(feedData);
    
             });
+          } catch (error) {
+            console.log(error);
+          }
+            
+            linkFlayerMap = [];
+    feeds.forEach(feedBlock => {
+        (async () => {
+          try {
+            const feed = parser.parseURL(feedBlock.link, function(err, feed) {
+              if (err) {
+                console.log(err);
+                return;
+              }
+              console.log(feed.title);
+              feed.items.forEach(item => {
+                
+                var linkData = {
+                  title: `${unescape(item.title)}`,
+                  link: `${unescape(item.link)}`,
+                  category: `${unescape(feedBlock.category)}`
+                }
+                linkFlayerMap.push(linkData);
+              
+              });
+            
+            }) 
+          } catch (error) {
+            console.log(error);
+          }
+          })().then();
+    });
             return;
               //fetchNextPage();
           }, function done(error) {
@@ -181,4 +190,3 @@ exports.getAnswer = async function (question) {
     return answerData;
 }
 
-this.getConfig();