fix: de-dupe platforms, spot-load user data

WFCD · Mar 19, 2021 · fde50be · fde50be
1 parent c832209
commit fde50be
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/CommonFunctions.js b/src/CommonFunctions.js
@@ -51,8 +51,8 @@ const isVulgarCheck = new RegExp('(n[i!1]gg[e3]r|n[i!1]gg[ua]|h[i!1]tl[e3]r|n[a@
  * Allowed platforms
  * @type {Array.<string>}
  */
-const platforms = ['pc', 'ps4', 'xb1', 'swi']
-  .concat((process.env.PLATFORMS || '').split(',').filter(p => p));
+const platforms = Array.from(new Set(['pc', 'ps4', 'xb1', 'swi']
+  .concat((process.env.PLATFORMS || '').split(',').filter(p => p))));
 
 /**
  * Games to enable.

diff --git a/src/embeds/TwitchEmbed.js b/src/embeds/TwitchEmbed.js
@@ -15,9 +15,9 @@ class TwitchEmbed extends BaseEmbed {
     this.url = `https://www.twitch.tv/${streamData.user_login}`;
 
     this.image = {
-      url: streamData.thumbnail_url
+      url: `${streamData.thumbnail_url
         .replace('{width}', '1280')
-        .replace('{height}', '720'),
+        .replace('{height}', '720')}?${Date.now()}`,
     };
 
     this.color = 6570405;

diff --git a/src/notifications/twitch/TwitchMonitor.js b/src/notifications/twitch/TwitchMonitor.js
@@ -267,17 +267,18 @@ class TwitchMonitor extends EventEmitter {
     return success;
   }
 
-  async #spotLoadGame (gameId) {
+  async spotLoadGame(gameId) {
     this.#handleGameList(await TwitchApi.fetchGames([gameId]));
     return this.#gameData[gameId];
   }
 
-  async #spotLoadStream (channel) {
+  async spotLoadStream(channel) {
     return this.#handleStreamList(await TwitchApi.fetchStreams([channel]));
   }
 
-  async #spotLoadUser (user) {
-    return this.#handleUserList(await TwitchApi.fetchUsers([user]));
+  async spotLoadUser(user) {
+    await this.#handleUserList(await TwitchApi.fetchUsers([user]));
+    return this.#userData[user];
   }
 }
 

diff --git a/src/notifications/twitch/TwitchNotifier.js b/src/notifications/twitch/TwitchNotifier.js
@@ -44,8 +44,12 @@ class TwitchNotifier {
     }
     logger.info('Ready', 'Twitch');
 
-    this.#monitor.on('live', (streamData) => {
+    this.#monitor.on('live', async (streamData) => {
       if (this.enabled) {
+        if (!streamData.user.display_name) {
+          streamData.user = await this.#monitor.spotLoadUser(streamData.user_name);
+        }
+
         const embed = new TwitchEmbed(streamData);
         let id = `${streamData.user_login}.live`;
         // add warframe type filtering for ids...
@@ -61,6 +65,7 @@ class TwitchNotifier {
             id = `${streamData.user_login}.other.live`;
           }
         }
+
         for (const platform of this.#activePlatforms) {
           this.#broadcaster.broadcast(embed, platform, id);
         }