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

Fix some jank with pending offline

Browse Source
This commit is contained in:
Natsumi
2025-09-29 14:36:40 +13:00
parent 9872cf1d93
commit 0724bc1f66
1 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/stores/friend.js
View File

@@ -307,7 +307,7 @@ export const useFriendStore = defineStore('Friend', () => {
} }
} }
const pendingOfflineDelay = 180000; const pendingOfflineDelay = 170000;
/** /**
* @param {string} id * @param {string} id
@@ -340,9 +340,10 @@ export const useFriendStore = defineStore('Friend', () => {
location = ref.location; location = ref.location;
$location_at = ref.$location_at; $location_at = ref.$location_at;
const currentState = stateInput || ctx.state;
// wtf, fetch user if offline in an instance // wtf, fetch user if offline in an instance
if ( if (
ctx.state !== 'online' && currentState !== 'online' &&
isRealInstance(ref.location) && isRealInstance(ref.location) &&
ref.$lastFetch < Date.now() - 10000 // 10 seconds ref.$lastFetch < Date.now() - 10000 // 10 seconds
) { ) {
@@ -355,7 +356,7 @@ export const useFriendStore = defineStore('Friend', () => {
} }
// wtf, fetch user if online in an offline location // wtf, fetch user if online in an offline location
if ( if (
ctx.state === 'online' && currentState === 'online' &&
ref.location === 'offline' && ref.location === 'offline' &&
ref.$lastFetch < Date.now() - 10000 // 10 seconds ref.$lastFetch < Date.now() - 10000 // 10 seconds
) { ) {
@@ -415,47 +416,40 @@ export const useFriendStore = defineStore('Friend', () => {
ctx.pendingOffline = true; ctx.pendingOffline = true;
ctx.pendingOfflineTime = Date.now(); ctx.pendingOfflineTime = Date.now();
// wait 2minutes then check if user came back online // wait 2minutes then check if user came back online
workerTimers.setTimeout(() => { workerTimers.setTimeout(
if (!ctx.pendingOffline) { () => {
if (AppDebug.debugFriendState) { if (!ctx.pendingOffline) {
console.log(ctx.name, 'pendingOfflineAlreadyCancelled'); if (AppDebug.debugFriendState) {
console.log(
ctx.name,
'pendingOfflineAlreadyCancelled'
);
}
return;
} }
return; ctx.pendingOffline = false;
} ctx.pendingOfflineTime = '';
ctx.pendingOffline = false; if (ctx.pendingState === ctx.state) {
ctx.pendingOfflineTime = ''; if (AppDebug.debugFriendState) {
if (ctx.pendingState === ctx.state) { console.log(
if (AppDebug.debugFriendState) { ctx.name,
console.log( 'pendingOfflineCancelledStateMatched'
ctx.name, );
'pendingOfflineCancelledStateMatched' }
); return;
} }
return; if (AppDebug.debugFriendState) {
} console.log(ctx.name, 'pendingOfflineEnd');
if (AppDebug.debugFriendState) { }
console.log(ctx.name, 'pendingOfflineEnd'); updateFriendDelayedCheck(ctx, location, $location_at);
} },
updateFriendDelayedCheck(ctx, location, $location_at); pendingOfflineDelay + Math.floor(Math.random() * 10000)
}, pendingOfflineDelay); ); // plus ~10sec random delay
} else { } else {
ctx.ref = ref; ctx.ref = ref;
ctx.isVIP = isVIP; ctx.isVIP = isVIP;
if (typeof ref !== 'undefined') { if (typeof ref !== 'undefined') {
ctx.name = ref.displayName; ctx.name = ref.displayName;
// wtf, try fetch user if online in offline location
if (
stateInput === 'online' &&
ref.$lastFetch < Date.now() - 10000 // 10 seconds
) {
console.log(
`Fetching friend coming online in offline location ${ctx.name}`
);
userRequest.getUser({
userId: id
});
return;
}
} }
updateFriendDelayedCheck(ctx, location, $location_at); updateFriendDelayedCheck(ctx, location, $location_at);
} }