From fd286fef2fd88253f5609fcc31c5f6f04caf8755 Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Fri, 19 Mar 2021 06:05:19 +1300
Subject: [PATCH] OnPlayerJoining fixes

---
 html/src/app.js | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/html/src/app.js b/html/src/app.js
index db453e89..a48b8f57 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -3693,24 +3693,11 @@ speechSynthesis.getVoices();
                             joining = false;
                             break;
                         }
-                        if ((gameLogItem.created_at < bias) ||
-                            (gameLogItem.type === 'Location')) {
+                        if ((gameLogItem.type === 'Location') ||
+                            (gameLogItem.type === 'OnPlayerLeft') && (gameLogItem.data === ctx.displayName)) {
                             break;
                         }
                     }
-                    if (joining) {
-                        for (var i = feedTable.length - 1; i > -1; i--) {
-                            var feedItem = feedTable[i];
-                            if (((feedItem.type === 'Friend') || ((feedItem.type === 'Status') && (feedItem.status[0].status === 'active'))) &&
-                                (feedItem.displayName === ctx.displayName)) {
-                                joining = false;
-                                break;
-                            }
-                            if (feedItem.created_at < bias) {
-                                break;
-                            }
-                        }
-                    }
                     if (joining) {
                         var onPlayerJoining = {
                             ...ctx,
@@ -6675,7 +6662,7 @@ speechSynthesis.getVoices();
         sharedFeedFilters.noty.Location = 'Off';
         sharedFeedFilters.noty.OnPlayerJoined = 'VIP';
         sharedFeedFilters.noty.OnPlayerLeft = 'VIP';
-        sharedFeedFilters.noty.OnPlayerJoining = 'VIP';
+        sharedFeedFilters.noty.OnPlayerJoining = 'Off';
         sharedFeedFilters.noty.Online = 'VIP';
         sharedFeedFilters.noty.Offline = 'VIP';
         sharedFeedFilters.noty.GPS = 'Off';