fix: moved requires around to fix ci

citizenfx · Aug 12, 2022 · 6ea1cef · 6ea1cef
1 parent 5da0cfe
commit 6ea1cef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/components/playerController/index.js b/src/components/playerController/index.js
@@ -6,7 +6,7 @@ const { dir, log, logOk, logWarn, logError } = require('../../extras/console')(m
 // eslint-disable-next-line no-unused-vars
 const { SAVE_PRIORITY_LOW, SAVE_PRIORITY_MEDIUM, SAVE_PRIORITY_HIGH, Database } = require('./database.js');
 const idGen = require('./idGenerator.js');
-
+const PlayerlistGenerator = require('./playerlistGenerator.js');
 
 //Helpers
 const now = () => { return Math.round(Date.now() / 1000); };
@@ -70,7 +70,6 @@ module.exports = class PlayerController {
 
         //Running playerlist generator
         if (GlobalData.isDeveloperMode && GlobalData.debugPlayerlistGenerator) {
-            const PlayerlistGenerator = require('./playerlistGenerator.js');
             this.playerlistGenerator = new PlayerlistGenerator();
         }
 

diff --git a/src/components/playerController/playerlistGenerator.js b/src/components/playerController/playerlistGenerator.js
@@ -1,5 +1,6 @@
 //Requires
 const modulename = 'PlayerlistGenerator';
+const fs = require('node:fs');
 const { dir, log, logOk, logWarn, logError } = require('../../extras/console')(modulename);
 const got = require('../../extras/got');
 
@@ -19,8 +20,10 @@ const unDups = (arr) => arr.filter((v, i) => arr.indexOf(v) === i);
 module.exports = class PlayerlistGenerator {
     constructor() {
         //Configs
+        const srcPath = './src/components/playerController/playerlist.ignore.json';
         this.config = {
-            srcPlayerlist: require('./playerlist.ignore.json'),
+            // srcPlayerlist: require('./playerlist.ignore.json'),
+            srcPlayerlist: JSON.parse(fs.readFileSync(srcPath)),
             // refreshInterval: 2*60*1000,
             refreshInterval: 10 * 1000,
             shouldAddRemovePlayers: true,