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

Clean up

Browse Source
This commit is contained in:
Natsumi
2021-03-21 09:56:09 +13:00
parent dae546f324
commit 3889dca933
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/src/app.js
+16 -20
View File
@@ -3659,7 +3659,7 @@ speechSynthesis.getVoices();
this.updateSharedFeedFeedTable(forceUpdate); this.updateSharedFeedFeedTable(forceUpdate);
this.updateSharedFeedNotificationTable(forceUpdate); this.updateSharedFeedNotificationTable(forceUpdate);
this.updateSharedFeedFriendLogTable(forceUpdate); this.updateSharedFeedFriendLogTable(forceUpdate);
this.updateSharedFeedPlayerModerationTable(forceUpdate); //this.updateSharedFeedPlayerModerationTable(forceUpdate);
var feeds = this.sharedFeed; var feeds = this.sharedFeed;
if (!feeds.pendingUpdate) { if (!feeds.pendingUpdate) {
return; return;
@@ -3766,13 +3766,12 @@ speechSynthesis.getVoices();
var n = 0; var n = 0;
var wristFilter = this.sharedFeedFilters.wrist; var wristFilter = this.sharedFeedFilters.wrist;
var notyFilter = this.sharedFeedFilters.noty; var notyFilter = this.sharedFeedFilters.noty;
var locationChange = false;
var playerCountIndex = 0; var playerCountIndex = 0;
var playerList = []; var playerList = [];
var friendList = []; var friendList = [];
while ((w < 20) || (n < 5) || ((!locationChange) && (this.hideOnPlayerJoined))) { for (var i = data.length - 1; i > -1; i--) {
var ctx = data[--i]; var ctx = data[i];
if ((i <= -1) || (ctx.created_at < bias)) { if (ctx.created_at < bias) {
break; break;
} }
if (ctx.type === 'Notification') { if (ctx.type === 'Notification') {
@@ -3808,9 +3807,6 @@ speechSynthesis.getVoices();
n--; n--;
} }
} }
if (w >= 20) {
locationChange = true;
}
} }
var isFriend = false; var isFriend = false;
var isFavorite = false; var isFavorite = false;
@@ -3909,9 +3905,9 @@ speechSynthesis.getVoices();
var n = 0; var n = 0;
var wristFilter = this.sharedFeedFilters.wrist; var wristFilter = this.sharedFeedFilters.wrist;
var notyFilter = this.sharedFeedFilters.noty; var notyFilter = this.sharedFeedFilters.noty;
while ((w < 20) || (n < 5)) { for (var i = data.length - 1; i > -1; i--) {
var ctx = data[--i]; var ctx = data[i];
if ((i <= -1) || (ctx.created_at < bias)) { if (ctx.created_at < bias) {
break; break;
} }
if (ctx.type === 'Avatar') { if (ctx.type === 'Avatar') {
@@ -3970,9 +3966,9 @@ speechSynthesis.getVoices();
var n = 0; var n = 0;
var wristFilter = this.sharedFeedFilters.wrist; var wristFilter = this.sharedFeedFilters.wrist;
var notyFilter = this.sharedFeedFilters.noty; var notyFilter = this.sharedFeedFilters.noty;
while ((w < 20) || (n < 5)) { for (var i = data.length - 1; i > -1; i--) {
var ctx = data[--i]; var ctx = data[i];
if ((i <= -1) || (ctx.created_at < bias)) { if (ctx.created_at < bias) {
break; break;
} }
if (ctx.senderUserId === API.currentUser.id) { if (ctx.senderUserId === API.currentUser.id) {
@@ -4028,9 +4024,9 @@ speechSynthesis.getVoices();
var n = 0; var n = 0;
var wristFilter = this.sharedFeedFilters.wrist; var wristFilter = this.sharedFeedFilters.wrist;
var notyFilter = this.sharedFeedFilters.noty; var notyFilter = this.sharedFeedFilters.noty;
while ((w < 20) || (n < 5)) { for (var i = data.length - 1; i > -1; i--) {
var ctx = data[--i]; var ctx = data[i];
if ((i <= -1) || (ctx.created_at < bias)) { if (ctx.created_at < bias) {
break; break;
} }
if (ctx.type === 'FriendRequest') { if (ctx.type === 'FriendRequest') {
@@ -4086,9 +4082,9 @@ speechSynthesis.getVoices();
var n = 0; var n = 0;
var wristFilter = this.sharedFeedFilters.wrist; var wristFilter = this.sharedFeedFilters.wrist;
var notyFilter = this.sharedFeedFilters.noty; var notyFilter = this.sharedFeedFilters.noty;
while ((w < 20) || (n < 5)) { for (var i = data.length - 1; i > -1; i--) {
var ctx = data[--i]; var ctx = data[i];
if ((i <= -1) || (ctx.created < bias)) { if (ctx.created < bias) {
break; break;
} }
if (ctx.sourceUserId === API.currentUser.id) { if (ctx.sourceUserId === API.currentUser.id) {
html/src/vr.js
+4 -1
View File
@@ -744,12 +744,15 @@ speechSynthesis.getVoices();
this.currentUserStatus = sharedRepository.getString('current_user_status'); this.currentUserStatus = sharedRepository.getString('current_user_status');
this.isGameRunning = sharedRepository.getBool('is_game_running'); this.isGameRunning = sharedRepository.getBool('is_game_running');
this.isGameNoVR = sharedRepository.getBool('is_Game_No_VR'); this.isGameNoVR = sharedRepository.getBool('is_Game_No_VR');
this.lastLocation = sharedRepository.getObject('last_location'); var lastLocation = sharedRepository.getObject('last_location');
if (lastLocation) {
this.lastLocation = lastLocation;
if (this.lastLocation.date !== 0) { if (this.lastLocation.date !== 0) {
this.lastLocationTimer = timeToText(Date.now() - this.lastLocation.date); this.lastLocationTimer = timeToText(Date.now() - this.lastLocation.date);
} else { } else {
this.lastLocationTimer = ''; this.lastLocationTimer = '';
} }
}
var newConfig = sharedRepository.getObject('VRConfigVars'); var newConfig = sharedRepository.getObject('VRConfigVars');
if (newConfig) { if (newConfig) {
if (JSON.stringify(newConfig) !== JSON.stringify(this.config)) { if (JSON.stringify(newConfig) !== JSON.stringify(this.config)) {