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

Fix timeout overlay not updating

Browse Source
This commit is contained in:
Natsumi
2021-12-01 11:21:44 +13:00
parent f558a1cb68
commit 0cf269750f
3 changed files with 132 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
html/src/app.js
View File

@@ -8186,9 +8186,11 @@ speechSynthesis.getVoices();
var id = parseInt(photonId, 10);
var timeSinceLastEvent = dtNow - Date.parse(dt);
if (timeSinceLastEvent > this.photonLobbyTimeoutThreshold) {
var joinTime = this.photonLobbyJointime.get(id);
if (this.photonLobbyJointime.has(id)) {
var {joinTime} = this.photonLobbyJointime.get(id);
}
if (!joinTime || joinTime + 120000 < dtNow) {
// wait 1min for user to load in
// wait 2mins for user to load in
var displayName = '';
var userId = '';
var ref = this.photonLobby.get(id);
@@ -8211,9 +8213,10 @@ speechSynthesis.getVoices();
}
}
});
hudTimeout.sort(function (a, b) {
if (a.time > b.time) {
return 1;
if (this.photonLobbyTimeout.length > 0 || hudTimeout.length > 0) {
hudTimeout.sort(function (a, b) {
if (a.time > b.time) {
return 1;
}
if (a.time < b.time) {
return -1;
@@ -8244,22 +8247,18 @@ speechSynthesis.getVoices();
}
AppApi.ExecuteVrOverlayFunction(
'updateHudTimeout',
JSON.stringify(filteredHudTimeout)
);
}
if (this.photonLobbyTimeout.length > 0 || hudTimeout.length > 0) {
JSON.stringify(filteredHudTimeout)
);
}
this.photonLobbyTimeout = hudTimeout;
this.getCurrentInstanceUserList();
} else {
this.photonLobbyTimeout = hudTimeout;
}
this.photonBotCheck(event7List);
this.photonBotCheck(event7List, dtNow);
});
setTimeout(() => this.photonLobbyWatcher(), 500);
workerTimers.setTimeout(() => this.photonLobbyWatcher(), 500);
};
$app.methods.photonBotCheck = function (event7List) {
var dtNow = Date.now();
$app.methods.photonBotCheck = function (event7List, dtNow) {
var event7PhotonIds = Object.keys(event7List);
var photonBots = [];
var currentUserPresent = false;
@@ -8267,7 +8266,10 @@ speechSynthesis.getVoices();
if (typeof ref !== 'undefined' && ref.id === API.currentUser.id) {
currentUserPresent = true;
}
var joinTime = this.photonLobbyJointime.get(id);
if (this.photonLobbyJointime.has(id)) {
var {joinTime, hasInstantiated, isInvisible, avatarEyeHeight} =
this.photonLobbyJointime.get(id);
}
if (
(!joinTime || joinTime + 3000 < dtNow) &&
typeof ref === 'undefined' &&
@@ -8275,6 +8277,69 @@ speechSynthesis.getVoices();
) {
photonBots.unshift(id);
}
if (joinTime && joinTime + 10000 < dtNow && !hasInstantiated) {
if (!this.photonLobbyBots.includes(id)) {
this.addEntryPhotonEvent({
photonId: id,
displayName: ref.displayName,
userId: ref.id,
text: 'photon bot has joined',
created_at: new Date().toJSON()
});
}
photonBots.unshift(id);
}
if (isInvisible) {
if (!this.photonLobbyBots.includes(id)) {
this.addEntryPhotonEvent({
photonId: id,
displayName: ref.displayName,
userId: ref.id,
text: 'has joined invisible',
created_at: new Date().toJSON()
});
}
photonBots.unshift(id);
}
if (avatarEyeHeight < 0) {
if (!this.photonLobbyBots.includes(id)) {
this.addEntryPhotonEvent({
photonId: id,
displayName: ref.displayName,
userId: ref.id,
text: 'photon bot has joined',
created_at: new Date().toJSON()
});
}
photonBots.unshift(id);
}
});
this.photonLobbyBots.forEach((id) => {
if (!photonBots.includes(id)) {
var ref = this.photonLobby.get(id);
var userId = '';
if (typeof ref.id !== 'undefined') {
userId = ref.id;
}
var displayName = `ID: ${id}`;
if (typeof ref.displayName !== 'undefined') {
displayName = ref.displayName;
}
var time = '';
if (this.photonLobbyJointime.has(id)) {
var {joinTime} = this.photonLobbyJointime.get(id);
if (typeof joinTime !== 'undefined') {
time = ` ${timeToText(Date.now() - joinTime)}`;
}
}
this.addEntryPhotonEvent({
photonId: id,
displayName,
userId,
text: `photon bot has left${time}`,
created_at: new Date().toJSON()
});
}
});
if (this.photonLobbyBots.length !== photonBots.length) {
// bad bug fix is bad
@@ -8295,18 +8360,6 @@ speechSynthesis.getVoices();
return;
}
this.updatePhotonLobbyBotSize(photonBots.length);
if (photonBots.length > 0) {
var text = `photonBotIds: ${photonBots.toString()}`;
} else {
var text = 'photonBotIds: 0';
}
this.addEntryPhotonEvent({
photonId: '',
displayName: '',
userId: '',
text,
created_at: new Date().toJSON()
});
}
this.photonLobbyBots = photonBots;
};
@@ -8430,6 +8483,15 @@ speechSynthesis.getVoices();
);
this.parsePhotonAvatar(data.Parameters[251].avatarDict);
this.parsePhotonAvatar(data.Parameters[251].favatarDict);
var lobbyJointime = this.photonLobbyJointime.get(
data.Parameters[253]
);
if (typeof lobbyJointime !== 'undefined') {
this.photonLobbyJointime.set(data.Parameters[253], {
...lobbyJointime,
hasInstantiated: true
});
}
} else if (data.Code === 255) {
// Join
if (typeof data.Parameters[249] !== 'undefined') {
@@ -8448,10 +8510,13 @@ speechSynthesis.getVoices();
this.parsePhotonAvatar(data.Parameters[249].favatarDict);
}
this.parsePhotonLobbyIds(data.Parameters[252].$values);
this.photonLobbyJointime.set(
data.Parameters[254],
Date.parse(gameLogDate)
);
this.photonLobbyJointime.set(data.Parameters[254], {
joinTime: Date.parse(gameLogDate),
hasInstantiated: false,
isInvisible: data.Parameters[249].isInvisible,
inVRMode: data.Parameters[249].inVRMode,
avatarEyeHeight: data.Parameters[249].avatarEyeHeight
});
this.startLobbyWatcherLoop();
} else if (data.Code === 254) {
// Leave
@@ -8756,6 +8821,7 @@ speechSynthesis.getVoices();
) {
tags = user.tags.$values;
}
var ref = API.cachedUsers.get(user.id);
var photonUser = {
id: user.id,
username: user.username,
@@ -8774,7 +8840,7 @@ speechSynthesis.getVoices();
};
this.photonLobby.set(photonId, photonUser);
this.photonLobbyCurrent.set(photonId, photonUser);
var ref = API.cachedUsers.get(user.id);
var bias = Date.parse(gameLogDate) + 60 * 1000; // 1min
if (bias > Date.now()) {
if (typeof ref === 'undefined' || typeof ref.id === 'undefined') {
@@ -8795,15 +8861,16 @@ speechSynthesis.getVoices();
ref.$location_at = joinTime;
ref.$online_for = joinTime;
}
if (ref.currentAvatarImageUrl !== user.currentAvatarImageUrl) {
if (typeof ref.id !== 'undefined') {
API.applyUser({
...ref,
currentAvatarImageUrl: user.currentAvatarImageUrl,
currentAvatarThumbnailImageUrl:
user.currentAvatarThumbnailImageUrl
});
}
if (
typeof ref.id !== 'undefined' &&
ref.currentAvatarImageUrl !== user.currentAvatarImageUrl
) {
API.applyUser({
...ref,
currentAvatarImageUrl: user.currentAvatarImageUrl,
currentAvatarThumbnailImageUrl:
user.currentAvatarThumbnailImageUrl
});
}
}
if (typeof ref !== 'undefined' && typeof ref.id !== 'undefined') {
@@ -12310,11 +12377,22 @@ speechSynthesis.getVoices();
var timeoutTime = 0;
if (typeof ref.id !== 'undefined') {
isFriend = $app.friends.has(ref.id);
$app.photonLobbyTimeout.forEach((ref1) => {
if (ref1.userId === ref.id) {
timeoutTime = ref1.time;
}
});
if (
$app.timeoutHudOverlayFilter === 'VIP' ||
$app.timeoutHudOverlayFilter === 'Friends'
) {
$app.photonLobbyTimeout.forEach((ref1) => {
if (ref1.userId === ref.id) {
timeoutTime = ref1.time;
}
});
} else {
$app.photonLobbyTimeout.forEach((ref1) => {
if (ref1.displayName === ref.displayName) {
timeoutTime = ref1.time;
}
});
}
}
users.push({
ref,

3
html/src/index.pug
View File

@@ -500,8 +500,7 @@ html
| &nbsp;
span.x-link(v-text="scope.row.displayName || scope.row.userId" @click="showUserDialog(scope.row.userId)")
template(v-if="scope.row.type === 'TrustLevel'")
br
span ({{ scope.row.previousTrustLevel }} #[i.el-icon-right] {{ scope.row.trustLevel }})
span ({{ scope.row.previousTrustLevel }} #[i.el-icon-right] {{ scope.row.trustLevel }})
el-table-column(label="Action" width="80" align="right")
template(v-once #default="scope")
el-button(type="text" icon="el-icon-close" size="mini" @click="deleteFriendLog(scope.row)")