Merge pull request #3 from bl3rune/name-override

Fix environment variables not applying correctly
bl3rune · Feb 5, 2023 · 988aa97 · 988aa97
2 parents 0d6c9f4 + 5b059ac
commit 988aa97
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gamedig-discord-bot",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "main": "dist/index.js",
   "scripts": {
     "build": "gulp",

diff --git a/src/services/discord-publisher.ts b/src/services/discord-publisher.ts
@@ -70,11 +70,12 @@ private serverUp: Map<Type,boolean>;
             let activity = this.buildActivityText(s);
 
             if (activities != '') {
-                activities = activities + ' ///// ';
+                activities = activities + activitySeperator;
             }
             activities = activities + activity;
             if (!this.serverUp.get(s.game)) {
                 console.log(`${s.game} : ${activity}`);
+                console.log(status);
                 this.announce(s.game, true);
             }
             this.serverUp.set(s.game,true);
@@ -121,12 +122,17 @@ private serverUp: Map<Type,boolean>;
 
         let nameOverride = process.env['NAME_OVERRIDE' + '.' + response.game];
         if (nameOverride) {
-            name = `${(status as any)[nameOverride]}`;
+            name = nameOverride;
         }
 
-        let rawNameOverride = process.env['RAW_NAME_OVERRIDE' + '.' + response.game];
-        if (rawNameOverride && name === '') {
-            name = `${raw[rawNameOverride]}`;
+        let nameField = process.env['NAME_FIELD' + '.' + response.game];
+        if (nameField  && name === '') {
+            name = `${(status as any)[nameField]}`;
+        }
+
+        let rawNameField = process.env['RAW_NAME_FIELD' + '.' + response.game];
+        if (rawNameField && name === '') {
+            name = `${raw[rawNameField]}`;
         }
 
         if (name === '') {