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

Fixes

Browse Source
This commit is contained in:
Natsumi
2023-09-17 10:35:22 +12:00
parent 851d72463b
commit f3160f080a
4 changed files with 68 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
html/src/app.js
View File

@@ -5522,7 +5522,11 @@ speechSynthesis.getVoices();
}; };
$app.methods.updateSharedExecute = function (forceUpdate) { $app.methods.updateSharedExecute = function (forceUpdate) {
this.updateSharedFeedDebounce(forceUpdate); try {
this.updateSharedFeedDebounce(forceUpdate);
} catch (err) {
console.error(err);
}
this.updateSharedFeedTimer = null; this.updateSharedFeedTimer = null;
this.updateSharedFeedPending = false; this.updateSharedFeedPending = false;
this.updateSharedFeedPendingForceUpdate = false; this.updateSharedFeedPendingForceUpdate = false;
@@ -5576,14 +5580,18 @@ speechSynthesis.getVoices();
// no group cache, fetch group and try again // no group cache, fetch group and try again
API.getGroup({ API.getGroup({
groupId: ref.$location.groupId groupId: ref.$location.groupId
}).then((args) => { })
workerTimers.setTimeout(() => { .then((args) => {
// delay to allow for group cache to update workerTimers.setTimeout(() => {
$app.sharedFeed.pendingUpdate = true; // delay to allow for group cache to update
$app.updateSharedFeed(false); $app.sharedFeed.pendingUpdate = true;
}, 100); $app.updateSharedFeed(false);
return args; }, 100);
}); return args;
})
.catch((err) => {
console.error(err);
});
} }
} }
if (typeof worldRef !== 'undefined') { if (typeof worldRef !== 'undefined') {
@@ -5606,14 +5614,18 @@ speechSynthesis.getVoices();
// no world cache, fetch world and try again // no world cache, fetch world and try again
API.getWorld({ API.getWorld({
worldId: ref.$location.worldId worldId: ref.$location.worldId
}).then((args) => { })
workerTimers.setTimeout(() => { .then((args) => {
// delay to allow for world cache to update workerTimers.setTimeout(() => {
$app.sharedFeed.pendingUpdate = true; // delay to allow for world cache to update
$app.updateSharedFeed(false); $app.sharedFeed.pendingUpdate = true;
}, 100); $app.updateSharedFeed(false);
return args; }, 100);
}); return args;
})
.catch((err) => {
console.error(err);
});
} }
} }
} }
@@ -9123,15 +9135,19 @@ speechSynthesis.getVoices();
$app.notificationTable.data = await database.getNotifications(); $app.notificationTable.data = await database.getNotifications();
await this.refreshNotifications(); await this.refreshNotifications();
await $app.getCurrentUserGroups(); await $app.getCurrentUserGroups();
if (configRepository.getBool(`friendLogInit_${args.json.id}`)) { try {
await $app.getFriendLog(); if (configRepository.getBool(`friendLogInit_${args.json.id}`)) {
} else { await $app.getFriendLog();
try { } else {
await $app.initFriendLog(args.json.id); await $app.initFriendLog(args.json.id);
} catch (err) {
this.logout();
throw err;
} }
} catch (err) {
$app.$message({
message: 'Failed to load freinds list, logging out',
type: 'error'
});
this.logout();
throw err;
} }
$app.getAvatarHistory(); $app.getAvatarHistory();
$app.getAllMemos(); $app.getAllMemos();
@@ -16521,7 +16537,11 @@ speechSynthesis.getVoices();
}; };
$app.methods.updatePlayerListExecute = function () { $app.methods.updatePlayerListExecute = function () {
this.updatePlayerListDebounce(); try {
this.updatePlayerListDebounce();
} catch (err) {
console.error(err);
}
this.updatePlayerListTimer = null; this.updatePlayerListTimer = null;
this.updatePlayerListPending = false; this.updatePlayerListPending = false;
}; };
@@ -18036,7 +18056,7 @@ speechSynthesis.getVoices();
} else if (unityPackage.platform) { } else if (unityPackage.platform) {
({ platform } = unityPackage); ({ platform } = unityPackage);
} }
platforms.push(`${platform}/${unityPackage.unityVersion}`); platforms.unshift(`${platform}/${unityPackage.unityVersion}`);
} }
} }
return platforms.join(', '); return platforms.join(', ');
@@ -22708,7 +22728,7 @@ speechSynthesis.getVoices();
return; return;
} }
// wait a bit for SteamVR to potentially close before deciding to relaunch // wait a bit for SteamVR to potentially close before deciding to relaunch
var restartDelay = 4000; var restartDelay = 5000;
if (this.isGameNoVR) { if (this.isGameNoVR) {
// wait for game to close before relaunching // wait for game to close before relaunching
restartDelay = 2000; restartDelay = 2000;

26
html/src/index.pug
View File

@@ -695,14 +695,6 @@ html
.detail .detail
span.name {{ $t('dialog.world.info.capacity') }} span.name {{ $t('dialog.world.info.capacity') }}
span.extra {{ worldDialog.ref.recommendedCapacity | commaNumber }} ({{ worldDialog.ref.capacity | commaNumber }}) span.extra {{ worldDialog.ref.recommendedCapacity | commaNumber }} ({{ worldDialog.ref.capacity | commaNumber }})
.x-friend-item(style="cursor:default")
.detail
span.name {{ $t('dialog.world.info.heat') }}
span.extra {{ worldDialog.ref.heat | commaNumber }} {{ '🔥'.repeat(worldDialog.ref.heat) }}
.x-friend-item(style="cursor:default")
.detail
span.name {{ $t('dialog.world.info.popularity') }}
span.extra {{ worldDialog.ref.popularity | commaNumber }} {{ '💖'.repeat(worldDialog.ref.popularity) }}
.x-friend-item(style="cursor:default") .x-friend-item(style="cursor:default")
.detail .detail
span.name {{ $t('dialog.world.info.created_at') }} span.name {{ $t('dialog.world.info.created_at') }}
@@ -711,11 +703,27 @@ html
.detail .detail
span.name {{ $t('dialog.world.info.last_updated') }} span.name {{ $t('dialog.world.info.last_updated') }}
span.extra {{ worldDialog.fileCreatedAt | formatDate('long') }} span.extra {{ worldDialog.fileCreatedAt | formatDate('long') }}
.x-friend-item(v-if="worldDialog.ref.labsPublicationDate !== 'none'" style="cursor:default")
.detail
span.name {{ $t('dialog.world.info.labs_publication_date') }}
span.extra {{ worldDialog.ref.labsPublicationDate | formatDate('long') }}
.x-friend-item(v-if="worldDialog.ref.publicationDate !== 'none'" style="cursor:default")
.detail
span.name {{ $t('dialog.world.info.publication_date') }}
span.extra {{ worldDialog.ref.publicationDate | formatDate('long') }}
.x-friend-item(style="cursor:default") .x-friend-item(style="cursor:default")
.detail .detail
span.name {{ $t('dialog.world.info.version') }} span.name {{ $t('dialog.world.info.version') }}
span.extra(v-text="worldDialog.ref.version") span.extra(v-text="worldDialog.ref.version")
.x-friend-item(style="width:525px;cursor:default") .x-friend-item(style="cursor:default")
.detail
span.name {{ $t('dialog.world.info.heat') }}
span.extra {{ worldDialog.ref.heat | commaNumber }} {{ '🔥'.repeat(worldDialog.ref.heat) }}
.x-friend-item(style="cursor:default")
.detail
span.name {{ $t('dialog.world.info.popularity') }}
span.extra {{ worldDialog.ref.popularity | commaNumber }} {{ '💖'.repeat(worldDialog.ref.popularity) }}
.x-friend-item(style="width:100%;cursor:default")
.detail .detail
span.name {{ $t('dialog.world.info.platform') }} span.name {{ $t('dialog.world.info.platform') }}
span.extra(v-text="worldDialogPlatform") span.extra(v-text="worldDialogPlatform")

4
html/src/localization/strings/en.json
View File

@@ -691,6 +691,8 @@
"popularity": "Popularity", "popularity": "Popularity",
"created_at": "Created At", "created_at": "Created At",
"last_updated": "Last Updated", "last_updated": "Last Updated",
"publication_date": "Publication Date",
"labs_publication_date": "Labs Publication Date",
"version": "Version", "version": "Version",
"platform": "Platform", "platform": "Platform",
"last_visited": "Last Visited", "last_visited": "Last Visited",
@@ -1331,7 +1333,7 @@
}, },
"change_world_capacity": { "change_world_capacity": {
"header": "Change Capacity", "header": "Change Capacity",
"description": "Enter world capacity (hard cap), Max: 80", "description": "Enter world maximum capacity (hard cap), Max: 80",
"cancel": "Cancel", "cancel": "Cancel",
"ok": "OK", "ok": "OK",
"input_error": "Valid number is required", "input_error": "Valid number is required",

2
html/src/mixins/tabs/playerList.pug
View File

@@ -35,7 +35,7 @@ mixin playerListTab()
.x-friend-item(style="cursor:default") .x-friend-item(style="cursor:default")
.detail .detail
span.name {{ $t('dialog.world.info.capacity') }} span.name {{ $t('dialog.world.info.capacity') }}
span.extra {{ currentInstanceWorld.ref.capacity | commaNumber }} ({{ currentInstanceWorld.ref.capacity * 2 | commaNumber }}) span.extra {{ currentInstanceWorld.ref.recommendedCapacity | commaNumber }} ({{ currentInstanceWorld.ref.capacity | commaNumber }})
.x-friend-item(style="cursor:default") .x-friend-item(style="cursor:default")
.detail .detail
span.name {{ $t('dialog.world.info.last_updated') }} span.name {{ $t('dialog.world.info.last_updated') }}