From d44b956aff18b67fa044990f153da3d71dd28e09 Mon Sep 17 00:00:00 2001
From: hgw <hgw7@yahoo.com>
Date: Mon, 2 Oct 2023 02:11:27 +0000
Subject: [PATCH] Fix feed-predef not functioning

---
 bot.js                  |  2 +-
 commands/feed-predef.js | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bot.js b/bot.js
index 52a6272..6386f6c 100644
--- a/bot.js
+++ b/bot.js
@@ -127,7 +127,7 @@ async function feed(chan, nick, provfeed, n) {
 
     } else if (predefinedFeeds.includes(predefString[0])) { //Predefined Feed lookup
         consoleLog('[bot.feed] Detected predefined feed: '+predefString[0])
-        openPostWorker(chan, "feed-predef", provfeed, n)
+        openPostWorker(chan, "feed-predef", provfeed, n, nick)
    
     } else if (provfeed === nick) { //User Feed Lookup
         consoleLog('[bot.feed] User feed requested')
diff --git a/commands/feed-predef.js b/commands/feed-predef.js
index 086e37f..8e566ad 100644
--- a/commands/feed-predef.js
+++ b/commands/feed-predef.js
@@ -1,9 +1,10 @@
 const config = require('../config/default.json')
 const uconfig = require('../config/usersettings.json')
 const { parentPort, workerData } = require('worker_threads');
-const { d1, d2 } = workerData;
+const { d1, d2, d3 } = workerData;
 var provfeed = d1;
 var n = d2
+var nick = d3
 let Parser = require('rss-parser');
 let parser = new Parser({
     headers: {'User-Agent': config.feed.useragent},
@@ -48,7 +49,7 @@ function errorMessage(error, code, extra) {
     process.exit()
 }
 
-async function twitter(feedURL, n) {
+async function twitter(feedURL, n, nick) {
     var content = [];
     consoleLog('[feed-predef.twitter] fetching @'+feedURL)
 
@@ -120,7 +121,7 @@ async function twitter(feedURL, n) {
     sendUpstream(content);
 }
 
-async function github(user, repo, type, n) {
+async function github(user, repo, type, n, nick) {
     var content = [];
     var validTypes = ['commits', 'releases']
     if ( validTypes.includes(type) == false ) {
@@ -193,7 +194,7 @@ 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);
+    twitter(provfeed[1], n, nick);
 } else if (provfeed[0] == "github") {
     if (provfeed[3] == undefined) {
         consoleLog("[feed-predef] No GitHub feed type provided, defaulting to commits")
@@ -202,7 +203,7 @@ if (provfeed[0] == "twitter") {
         var type = provfeed[3]
     }
     consoleLog("[feed-predef] Running GitHub function")
-    github(provfeed[1], provfeed[2], type, n)
+    github(provfeed[1], provfeed[2], type, n, nick)
 }