From a54c6089258fb75b29e2e3f6fda3cb99e71f6b05 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Tue, 9 Feb 2021 06:55:16 +1300
Subject: [PATCH] OnPlayingJoining cleanup

---
 html/src/vr.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/html/src/vr.js b/html/src/vr.js
index 5314877b..1aff3fa9 100644
--- a/html/src/vr.js
+++ b/html/src/vr.js
@@ -839,7 +839,7 @@ speechSynthesis.getVoices();
                     var joining = true;
                     for (var k = 0; k < feeds.length; k++) {
                         var feedItem = feeds[k];
-                        if (((feedItem.type === 'OnPlayerJoined') && (feedItem.data === ctx.displayName)) ||
+                        if ((feedItem.data === ctx.displayName) ||
                             ((feedItem.type === 'Friend') && (feedItem.displayName === ctx.displayName))) {
                             joining = false;
                             break;
@@ -851,12 +851,13 @@ speechSynthesis.getVoices();
                         }
                     }
                     if (joining) {
-                        var onPlayerJoining = {};
-                        onPlayerJoining.created_at = ctx.created_at;
-                        onPlayerJoining.data = ctx.displayName;
-                        onPlayerJoining.isFavorite = ctx.isFavorite;
-                        onPlayerJoining.isFriend = ctx.isFriend;
-                        onPlayerJoining.type = 'OnPlayerJoining';
+                        var onPlayerJoining = {
+                            created_at: ctx.created_at,
+                            data: ctx.displayName,
+                            isFavorite: ctx.isFavorite,
+                            isFriend: ctx.isFriend,
+                            type: 'OnPlayerJoining'
+                        };
                         feeds.splice(i, 0, onPlayerJoining);
                         i++;
                     }
@@ -970,7 +971,7 @@ speechSynthesis.getVoices();
             }
             var message = '';
             for (i = 0; i < messageList.length; i++) {
-                if (typeof noty.details[messageList[i]] !== 'undefined') {
+                if (typeof noty.details !== 'undefined' && typeof noty.details[messageList[i]] !== 'undefined') {
                     message = noty.details[messageList[i]];
                 }
             }