From 447cef9c832d6f41ac8a0e723b7c86d312bc699e Mon Sep 17 00:00:00 2001 From: Natsumi Date: Tue, 1 Jun 2021 07:37:40 +1200 Subject: [PATCH] Make OnPlayerLeft/OnPlayerJoined suppression work more consistently --- html/src/app.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/html/src/app.js b/html/src/app.js index ef8b32c8..1e403f1a 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -3980,14 +3980,15 @@ speechSynthesis.getVoices(); } // on Location change remove OnPlayerLeft if (ctx.type === 'OnPlayerLeft') { - if (ctx.created_at === currentUserLeaveTime) { + if (ctx.created_at.slice(0, -4) === currentUserLeaveTime) { continue; } if (ctx.data === API.currentUser.displayName) { - currentUserLeaveTime = ctx.created_at; + var { created_at } = ctx; + currentUserLeaveTime = created_at.slice(0, -4); for (var k = w - 1; k > -1; k--) { var feedItem = wristArr[k]; - if ((feedItem.created_at === currentUserLeaveTime) && + if ((feedItem.created_at.slice(0, -4) === currentUserLeaveTime) && (feedItem.type === 'OnPlayerLeft')) { wristArr.splice(k, 1); w--; @@ -3995,7 +3996,7 @@ speechSynthesis.getVoices(); } for (var k = n - 1; k > -1; k--) { var feedItem = notyArr[k]; - if ((feedItem.created_at === currentUserLeaveTime) && + if ((feedItem.created_at.slice(0, -4) === currentUserLeaveTime) && (feedItem.type === 'OnPlayerLeft')) { notyArr.splice(k, 1); n--; @@ -4006,14 +4007,15 @@ speechSynthesis.getVoices(); } // on Location change remove OnPlayerJoined if (ctx.type === 'OnPlayerJoined') { - if (ctx.created_at === currentUserJoinTime) { + if (ctx.created_at.slice(0, -4) === currentUserJoinTime) { continue; } if (ctx.data === API.currentUser.displayName) { - currentUserJoinTime = ctx.created_at; + var { created_at } = ctx; + currentUserJoinTime = created_at.slice(0, -4); for (var k = w - 1; k > -1; k--) { var feedItem = wristArr[k]; - if ((feedItem.created_at === currentUserJoinTime) && + if ((feedItem.created_at.slice(0, -4) === currentUserJoinTime) && (feedItem.type === 'OnPlayerJoined')) { wristArr.splice(k, 1); w--; @@ -4021,7 +4023,7 @@ speechSynthesis.getVoices(); } for (var k = n - 1; k > -1; k--) { var feedItem = notyArr[k]; - if ((feedItem.created_at === currentUserJoinTime) && + if ((feedItem.created_at.slice(0, -4) === currentUserJoinTime) && (feedItem.type === 'OnPlayerJoined')) { notyArr.splice(k, 1); n--;