From 3d14be15b68ab44c5828ae251394615d11de415e Mon Sep 17 00:00:00 2001
From: hgw <hgw7@yahoo.com>
Date: Mon, 2 Oct 2023 02:11:27 +0000
Subject: [PATCH] enhanced logging

---
 bot.js                  | 19 +++++++++----------
 commands/feed-predef.js |  9 ++++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bot.js b/bot.js
index 91ce219..f4971fa 100644
--- a/bot.js
+++ b/bot.js
@@ -51,7 +51,7 @@ function openPostWorker(chan, command, d1, d2, d3, d4, d5) {
         }
     });
     worker.once('message', (string) => {
-        consoleLog(`[bot.openPostWorker] Got output from ${command}, sending to `+chan);
+        consoleLog(`[bot.openPostWorker.finalising] Got output from ${command}, sending to `+chan);
         bot.say(chan, string);
     });
 }
@@ -79,7 +79,7 @@ async function feed(chan, nick, provfeed, n) {
         var provfeed = nick;
     }
     if (n === undefined) {
-        consoleLog('[bot.feed] no amount was passed, reverting to default')
+        consoleLog('[bot.feed] No post was passed, reverting to '+config.feed.default_amount+', your set default.')
         var n = config.feed.default_amount;
     }
 
@@ -87,9 +87,8 @@ async function feed(chan, nick, provfeed, n) {
         consoleLog('[bot.feed] Valid URL requested')
         openPostWorker(chan, 'feed-preset', provfeed, n);
 
-    } else if (predefinedFeeds.includes(predefString[0])) {
-        console.log(predefString[0])
-        //bot.say(chan, "Should work good")
+    } else if (predefinedFeeds.includes(predefString[0])) { //Predefined Feed lookup
+        consoleLog('[bot.feed] Detected predefined feed: '+predefString[0])
         openPostWorker(chan, "feed-predef", provfeed, n)
    
     } else if (provfeed === nick) { //User Feed Lookup
@@ -157,21 +156,21 @@ bot.addListener('error', function(message) {
     consoleLog('[ERROR]' +message)
 });
 
-console.log('[main] Starting Mercury');
+consoleLog('[bot.init] Welcome to Mercury');
 fs.open('./config/usersettings.json','r',function(err, fd){
     if (err) {
       fs.writeFile('./config/usersettings.json', '', function(err) {
           if(err) {
-              console.log(err);
+            consoleLog(err);
           }
-          console.log("[main.setup] usersettings.json did not exist, it has been created");
+          consoleLog("[bot.init] usersettings.json did not exist, it has been created");
       });
       fs.writeFileSync('./config/usersettings.json', "\{\n\}")
     } else {
-      console.log("[main] usersettings.json exists, continuing");
+        consoleLog("[bot.init] usersettings.json exists, continuing");
     }
   });
-console.log('[main.irc] Connecting to '+config.irc.server+'/'+config.irc.port+' as '+config.irc.nickname);
+consoleLog('[bot.init] Connecting to '+config.irc.server+'/'+config.irc.port+' as '+config.irc.nickname);
 
 process.on('uncaughtException', function (err) {
     console.error(err);
diff --git a/commands/feed-predef.js b/commands/feed-predef.js
index d255437..e60fec5 100644
--- a/commands/feed-predef.js
+++ b/commands/feed-predef.js
@@ -91,7 +91,7 @@ async function twitter(feedURL, n) {
         if (data.isoDate !== undefined) {
             var date = moment(data.isoDate)
             var syncDate = date.tz(config.feed.timezone)
-            console.log(syncDate.format())
+            consoleLog('[feed-predef.twitter] Got tweet from '+syncDate.format())
             var date = syncDate.format(config.feed.time_format)
         } else {
             var date = data.pubDate
@@ -134,7 +134,7 @@ async function github(user, repo, type, n) {
             errorMessage(e, "404", feedURL);
         }
     }
-    console.log(newFeed.items[1])
+    //consoleLog(newFeed.items[1])
     if (n > newFeed.items.length) {
         var n = newFeed.items.length;
         content.push(warningMsg+" Your requested post amount exceeded the total available. Reverting to " + newFeed.items.length);
@@ -158,7 +158,7 @@ async function github(user, repo, type, n) {
         if (data.isoDate !== undefined) {
             var date = moment(data.isoDate)
             var syncDate = date.tz(config.feed.timezone)
-            console.log(syncDate.format())
+            //console.log(syncDate.format())
             var date = syncDate.format(config.feed.time_format)
         } else {
             var date = data.pubDate
@@ -184,13 +184,16 @@ async function github(user, repo, type, n) {
 
 var provfeed = provfeed.toLowerCase().split("/")
 if (provfeed[0] == "twitter") {
+    consoleLog("[feed-predef] Running twitter function")
     twitter(provfeed[1], n);
 } else if (provfeed[0] == "github") {
     if (provfeed[3] == undefined) {
+        consoleLog("[feed-predef] No GitHub feed type provided, defaulting to commits")
         var type = "commits"
     } else {
         var type = provfeed[3]
     }
+    consoleLog("[feed-predef] Running GitHub function")
     github(provfeed[1], provfeed[2], type, n)
 }