MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-19 06:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Stop displaying onJoining when joining with hidden joins on join

Browse Source
This commit is contained in:
Natsumi
2021-02-23 02:26:55 +13:00
parent 81c71388a7
commit 20ab4278c3
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
html/src/app.js
View File

@@ -3689,6 +3689,7 @@ speechSynthesis.getVoices();
if ((this.isGameRunning) && ((this.sharedFeedFilters.wrist.OnPlayerJoining === 'Friends') || (this.sharedFeedFilters.wrist.OnPlayerJoining === 'VIP') ||
(this.sharedFeedFilters.noty.OnPlayerJoining === 'Friends') || (this.sharedFeedFilters.noty.OnPlayerJoining === 'VIP'))) {
var bias = new Date(Date.now() - 120000).toJSON();
var locationBias = new Date(Date.now() - 10000).toJSON();
for (var i = 0; i < wristFeed.length; i++) {
var ctx = wristFeed[i];
if ((ctx.created_at < bias) || (ctx.type === 'Location')) {
@@ -3698,14 +3699,19 @@ speechSynthesis.getVoices();
var joining = true;
for (var k = 0; k < wristFeed.length; k++) {
var feedItem = wristFeed[k];
if ((feedItem.data === ctx.displayName) ||
((feedItem.type === 'Friend') && (feedItem.displayName === ctx.displayName))) {
if ((this.hideOnPlayerJoined) && (feedItem.type === 'Location') &&
(feedItem.created_at < locationBias)) {
joining = false;
break;
}
if ((feedItem.created_at < bias) || (feedItem.type === 'Location') ||
((feedItem.type === 'GPS') && (feedItem.created_at !== ctx.created_at) &&
(feedItem.displayName === ctx.displayName))) {
if ((feedItem.data === ctx.displayName) ||
(((feedItem.type === 'Friend') || (feedItem.type === 'Status')) && (feedItem.displayName === ctx.displayName))) {
joining = false;
break;
}
if ((feedItem.created_at < bias) ||
(feedItem.type === 'Location') ||
((feedItem.type === 'GPS') && (feedItem.created_at !== ctx.created_at) && (feedItem.displayName === ctx.displayName))) {
break;
}
}