Merge pull request #34 from Habilya/dev

Merge Add ReactionsReportTemplateFolderFullPath
Habilya · Feb 20, 2025 · 42688c9 · 42688c9
2 parents 0d2226c + 07e8f9f
commit 42688c9
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/conf/config.test.json b/conf/config.test.json
@@ -1,9 +1,10 @@
 {
-    "Token": "[YOUR_BOT_TOKEN_HERE]",
-    "GuildId": "[YOUR_DISCORD_SERVER_ID_HERE]",
-    "ClientId": "[YOUR_BOT_ID_HERE]",
-    "BotActivityStatusName": "[YOUR_BOT_STATUS_ACTIVITY_NAME]",
-    "isReactionToUserMessagesEnabled": true,
-    "ChromiumBrowserPath": "[YOUR_CHROMIUM_BROWSER_PATH]",
-    "MongodbURI": "[YOUR_MONGODB_URI_HERE]"
+  "Token": "[YOUR_BOT_TOKEN_HERE]",
+  "GuildId": "[YOUR_DISCORD_SERVER_ID_HERE]",
+  "ClientId": "[YOUR_BOT_ID_HERE]",
+  "BotActivityStatusName": "[YOUR_BOT_STATUS_ACTIVITY_NAME]",
+  "isReactionToUserMessagesEnabled": true,
+  "ReactionsReportTemplateFolderFullPath": "[YOUR_REPORTS_TEMPLATES_PATH]",
+  "ChromiumBrowserPath": "[YOUR_CHROMIUM_BROWSER_PATH]",
+  "MongodbURI": "[YOUR_MONGODB_URI_HERE]"
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wordcountingdiscordbotjs",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A discord bot to count how many times a specific word or a pattern was spoken",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/commands/reactions/topReactionsByUser.js b/src/commands/reactions/topReactionsByUser.js
@@ -104,8 +104,7 @@ module.exports = {
                 }
 
                 // Read the templates
-                const pathToHTMLTemplates = '../../assets/templates/';
-                leaderBoardTemplator.initTemplates(pathToHTMLTemplates);
+                leaderBoardTemplator.initTemplates(discordBot.getConfig().ReactionsReportTemplateFolderFullPath);
 
                 const generatedLadderboard_li = await leaderBoardTemplator.PrepareLeaderBoardTable(interaction, topUsersReactionsByReactionName, LEADERBOARD_DISPLAY_LIMIT);
 

diff --git a/src/configure/discordBot.js b/src/configure/discordBot.js
@@ -46,6 +46,11 @@ exports.validateConfig = function () {
         isValid = false;
         logger.warning(`If isReactionToUserMessagesEnabled, ${validateStringInConfig('MongodbURI')}`);
     }
+
+    if (config.isReactionToUserMessagesEnabled && stringFunctions.stringIsNullOrEmpty(config.ReactionsReportTemplateFolderFullPath)) {
+        isValid = false;
+        logger.warning(`If isReactionToUserMessagesEnabled, ${validateStringInConfig('ReactionsReportTemplateFolderFullPath')}`);
+    }
 };
 
 // Function Initializes the client property

diff --git a/test/commands.misc.help.test.js b/test/commands.misc.help.test.js
@@ -25,7 +25,7 @@ describe('Command help.js tests', () => {
             fields: [
               {
                 name: "Ver.",
-                value: "1.0.5",
+                value: "1.0.6",
               },
               {
                 name: "Description",

diff --git a/test/conf.config-reading.test.js b/test/conf.config-reading.test.js
@@ -84,4 +84,15 @@ describe('config.json reading test', () => {
         expect(actual).toBe(expected);
     });
 
+    it('can read config.json ReactionsReportTemplateFolderFullPath', () => {
+        // Arrange
+        let expected = "[YOUR_REPORTS_TEMPLATES_PATH]";
+
+        // Act
+        let actual = config.ReactionsReportTemplateFolderFullPath;
+
+        // Assert
+        expect(actual).toBe(expected);
+    });
+
 });
diff --git a/test/configure.discordBot.test.js b/test/configure.discordBot.test.js
@@ -43,13 +43,14 @@ describe('01initialized.js tests', () => {
         discordBot.validateConfig();
 
         // Assert
-        expect(discordBot.getLogger().warning.mock.calls).toHaveLength(5);
+        expect(discordBot.getLogger().warning.mock.calls).toHaveLength(6);
         expect(discordBot.getLogger().warning.mock.calls).toEqual([
             ["Field Token must be configured in the conf/config.json file"],
             ["Field GuildId must be configured in the conf/config.json file"],
             ["Field ClientId must be configured in the conf/config.json file"],
             ["If isReactionToUserMessagesEnabled, Field ChromiumBrowserPath must be configured in the conf/config.json file"],
-            ["If isReactionToUserMessagesEnabled, Field MongodbURI must be configured in the conf/config.json file"]
+            ["If isReactionToUserMessagesEnabled, Field MongodbURI must be configured in the conf/config.json file"],
+            ["If isReactionToUserMessagesEnabled, Field ReactionsReportTemplateFolderFullPath must be configured in the conf/config.json file"]
         ]);
     });