diff --git a/html/src/app.js b/html/src/app.js index be2dd084..68dbd4e8 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -5522,7 +5522,11 @@ speechSynthesis.getVoices(); }; $app.methods.updateSharedExecute = function (forceUpdate) { - this.updateSharedFeedDebounce(forceUpdate); + try { + this.updateSharedFeedDebounce(forceUpdate); + } catch (err) { + console.error(err); + } this.updateSharedFeedTimer = null; this.updateSharedFeedPending = false; this.updateSharedFeedPendingForceUpdate = false; @@ -5576,14 +5580,18 @@ speechSynthesis.getVoices(); // no group cache, fetch group and try again API.getGroup({ groupId: ref.$location.groupId - }).then((args) => { - workerTimers.setTimeout(() => { - // delay to allow for group cache to update - $app.sharedFeed.pendingUpdate = true; - $app.updateSharedFeed(false); - }, 100); - return args; - }); + }) + .then((args) => { + workerTimers.setTimeout(() => { + // delay to allow for group cache to update + $app.sharedFeed.pendingUpdate = true; + $app.updateSharedFeed(false); + }, 100); + return args; + }) + .catch((err) => { + console.error(err); + }); } } if (typeof worldRef !== 'undefined') { @@ -5606,14 +5614,18 @@ speechSynthesis.getVoices(); // no world cache, fetch world and try again API.getWorld({ worldId: ref.$location.worldId - }).then((args) => { - workerTimers.setTimeout(() => { - // delay to allow for world cache to update - $app.sharedFeed.pendingUpdate = true; - $app.updateSharedFeed(false); - }, 100); - return args; - }); + }) + .then((args) => { + workerTimers.setTimeout(() => { + // delay to allow for world cache to update + $app.sharedFeed.pendingUpdate = true; + $app.updateSharedFeed(false); + }, 100); + return args; + }) + .catch((err) => { + console.error(err); + }); } } } @@ -9123,15 +9135,19 @@ speechSynthesis.getVoices(); $app.notificationTable.data = await database.getNotifications(); await this.refreshNotifications(); await $app.getCurrentUserGroups(); - if (configRepository.getBool(`friendLogInit_${args.json.id}`)) { - await $app.getFriendLog(); - } else { - try { + try { + if (configRepository.getBool(`friendLogInit_${args.json.id}`)) { + await $app.getFriendLog(); + } else { 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.getAllMemos(); @@ -16521,7 +16537,11 @@ speechSynthesis.getVoices(); }; $app.methods.updatePlayerListExecute = function () { - this.updatePlayerListDebounce(); + try { + this.updatePlayerListDebounce(); + } catch (err) { + console.error(err); + } this.updatePlayerListTimer = null; this.updatePlayerListPending = false; }; @@ -18036,7 +18056,7 @@ speechSynthesis.getVoices(); } else if (unityPackage.platform) { ({ platform } = unityPackage); } - platforms.push(`${platform}/${unityPackage.unityVersion}`); + platforms.unshift(`${platform}/${unityPackage.unityVersion}`); } } return platforms.join(', '); @@ -22708,7 +22728,7 @@ speechSynthesis.getVoices(); return; } // wait a bit for SteamVR to potentially close before deciding to relaunch - var restartDelay = 4000; + var restartDelay = 5000; if (this.isGameNoVR) { // wait for game to close before relaunching restartDelay = 2000; diff --git a/html/src/index.pug b/html/src/index.pug index 55798b14..7295054c 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -695,14 +695,6 @@ html .detail span.name {{ $t('dialog.world.info.capacity') }} 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") .detail span.name {{ $t('dialog.world.info.created_at') }} @@ -711,11 +703,27 @@ html .detail span.name {{ $t('dialog.world.info.last_updated') }} 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") .detail span.name {{ $t('dialog.world.info.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 span.name {{ $t('dialog.world.info.platform') }} span.extra(v-text="worldDialogPlatform") diff --git a/html/src/localization/strings/en.json b/html/src/localization/strings/en.json index b3029334..82fb00a8 100644 --- a/html/src/localization/strings/en.json +++ b/html/src/localization/strings/en.json @@ -691,6 +691,8 @@ "popularity": "Popularity", "created_at": "Created At", "last_updated": "Last Updated", + "publication_date": "Publication Date", + "labs_publication_date": "Labs Publication Date", "version": "Version", "platform": "Platform", "last_visited": "Last Visited", @@ -1331,7 +1333,7 @@ }, "change_world_capacity": { "header": "Change Capacity", - "description": "Enter world capacity (hard cap), Max: 80", + "description": "Enter world maximum capacity (hard cap), Max: 80", "cancel": "Cancel", "ok": "OK", "input_error": "Valid number is required", diff --git a/html/src/mixins/tabs/playerList.pug b/html/src/mixins/tabs/playerList.pug index 0282bfb5..0ca6e506 100644 --- a/html/src/mixins/tabs/playerList.pug +++ b/html/src/mixins/tabs/playerList.pug @@ -35,7 +35,7 @@ mixin playerListTab() .x-friend-item(style="cursor:default") .detail 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") .detail span.name {{ $t('dialog.world.info.last_updated') }}