diff --git a/html/src/app.js b/html/src/app.js index a9af25d8..df4b0012 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -1076,7 +1076,7 @@ speechSynthesis.getVoices(); '' + '
' + 'PC: {{ platforms.standalonewindows }}
' + - 'Quest: {{ platforms.android }}
' + + 'Android: {{ platforms.android }}
' + '{{ $t("dialog.user.info.instance_game_version") }} {{ gameServerVersion }}
' + '{{ $t("dialog.user.info.instance_queuing_enabled") }}
' + '{{ $t("dialog.user.info.instance_users") }}
' + @@ -11366,12 +11366,6 @@ speechSynthesis.getVoices(); } if (data.avatarEyeHeight < 0) { text = 'Photon bot has joined, invalid avatarEyeHeight'; - } else if ( - data.user.last_platform === 'android' && - platforms.length > 0 && - !platforms.includes('android') - ) { - var text = 'User joined as Quest in PC only world'; } if (text) { this.addEntryPhotonEvent({ @@ -11435,15 +11429,6 @@ speechSynthesis.getVoices(); userId: user.id }); ref = args.ref; - if (photonUser.last_platform !== ref.last_platform) { - this.addEntryPhotonEvent({ - photonId, - text: `API/Photon platform mismatch ${ref.last_platform}/${photonUser.last_platform}`, - type: 'PhotonBot', - color: 'yellow', - created_at: Date.parse(gameLogDate) - }); - } } catch (err) { console.error(err); ref = photonUser; @@ -11530,7 +11515,7 @@ speechSynthesis.getVoices(); avatar.description = this.replaceBioSymbols(avatar.description); var platform = ''; if (user.last_platform === 'android') { - platform = 'Quest'; + platform = 'Android'; } else if (user.last_platform === 'ios') { platform = 'iOS'; } else if (user.inVRMode) { @@ -16693,7 +16678,7 @@ speechSynthesis.getVoices(); this.currentInstanceWorld.inCache = true; this.currentInstanceWorld.cacheSize = `${( cacheInfo.Item1 / 1048576 - ).toFixed(2)} MiB`; + ).toFixed(2)} MB`; } }); this.getBundleDateSize(args.ref).then( @@ -16720,7 +16705,7 @@ speechSynthesis.getVoices(); this.currentInstanceWorld.inCache = true; this.currentInstanceWorld.cacheSize = `${( cacheInfo.Item1 / 1048576 - ).toFixed(2)} MiB`; + ).toFixed(2)} MB`; } }); }); @@ -17391,7 +17376,7 @@ speechSynthesis.getVoices(); createdAt = version.created_at; fileSize = `${( version.file.sizeInBytes / 1048576 - ).toFixed(2)} MiB`; + ).toFixed(2)} MB`; break; } } @@ -18004,7 +17989,7 @@ speechSynthesis.getVoices(); if (unityPackage.platform === 'standalonewindows') { platform = 'PC'; } else if (unityPackage.platform === 'android') { - platform = 'Quest'; + platform = 'Android'; } else if (unityPackage.platform) { ({ platform } = unityPackage); } @@ -18145,7 +18130,7 @@ speechSynthesis.getVoices(); if (version.version === fileVersion) { D.fileSize = `${( version.file.sizeInBytes / 1048576 - ).toFixed(2)} MiB`; + ).toFixed(2)} MB`; break; } } @@ -18380,7 +18365,7 @@ speechSynthesis.getVoices(); if (unityPackage.platform === 'standalonewindows') { platform = 'PC'; } else if (unityPackage.platform === 'android') { - platform = 'Quest'; + platform = 'Android'; } else if (unityPackage.platform) { ({ platform } = unityPackage); } @@ -22276,7 +22261,7 @@ speechSynthesis.getVoices(); D.inCache = true; D.cacheSize = `${(cacheInfo.Item1 / 1048576).toFixed( 2 - )} MiB`; + )} MB`; D.cachePath = cacheInfo.Item3; } D.cacheLocked = cacheInfo.Item2; @@ -22296,7 +22281,7 @@ speechSynthesis.getVoices(); D.inCache = true; D.cacheSize = `${(cacheInfo.Item1 / 1048576).toFixed( 2 - )} MiB`; + )} MB`; D.cachePath = cacheInfo.Item3; } D.cacheLocked = cacheInfo.Item2; @@ -27684,17 +27669,17 @@ speechSynthesis.getVoices(); } var ref = args.json; if (typeof ref.fileSize !== 'undefined') { - ref._fileSize = `${(ref.fileSize / 1048576).toFixed(2)} MiB`; + ref._fileSize = `${(ref.fileSize / 1048576).toFixed(2)} MB`; } if (typeof ref.uncompressedSize !== 'undefined') { ref._uncompressedSize = `${(ref.uncompressedSize / 1048576).toFixed( 2 - )} MiB`; + )} MB`; } if (typeof ref.avatarStats?.totalTextureUsage !== 'undefined') { ref._totalTextureUsage = `${( ref.avatarStats.totalTextureUsage / 1048576 - ).toFixed(2)} MiB`; + ).toFixed(2)} MB`; } $app.avatarDialog.fileAnalysis = buildTreeData(args.json); }); @@ -27747,6 +27732,91 @@ speechSynthesis.getVoices(); D.visible = true; }; + // #endregion + // #region | Open common folders + + $app.methods.openVrcxAppDataFolder = function () { + AppApi.OpenVrcxAppDataFolder().then((result) => { + if (result) { + this.$message({ + message: 'Folder opened', + type: 'success' + }); + } else { + this.$message({ + message: "Folder dosn't exist", + type: 'error' + }); + } + }); + }; + + $app.methods.openVrcAppDataFolder = function () { + AppApi.OpenVrcAppDataFolder().then((result) => { + if (result) { + this.$message({ + message: 'Folder opened', + type: 'success' + }); + } else { + this.$message({ + message: "Folder dosn't exist", + type: 'error' + }); + } + }); + }; + + $app.methods.openVrcPhotosFolder = function () { + AppApi.OpenVrcPhotosFolder().then((result) => { + if (result) { + this.$message({ + message: 'Folder opened', + type: 'success' + }); + } else { + this.$message({ + message: "Folder dosn't exist", + type: 'error' + }); + } + }); + }; + + $app.methods.openVrcScreenshotsFolder = function () { + AppApi.OpenVrcScreenshotsFolder().then((result) => { + if (result) { + this.$message({ + message: 'Folder opened', + type: 'success' + }); + } else { + this.$message({ + message: "Folder dosn't exist", + type: 'error' + }); + } + }); + }; + + $app.methods.openCrashVrcCrashDumps = function () { + AppApi.OpenCrashVrcCrashDumps().then((result) => { + if (result) { + this.$message({ + message: 'Folder opened', + type: 'success' + }); + } else { + this.$message({ + message: "Folder dosn't exist", + type: 'error' + }); + } + }); + }; + + // #endregion + $app = new Vue($app); window.$app = $app; })(); diff --git a/html/src/index.pug b/html/src/index.pug index b1b298c4..7e2ad861 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -250,7 +250,7 @@ html el-tag.x-tag-vip(v-if="userDialog.ref.$isModerator" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.user.tags.vrchat_team') }} el-tag.x-tag-vrcplus(v-if="userDialog.ref.$isVRCPlus" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") VRC+ el-tag.x-tag-platform-pc(v-if="userDialog.ref.last_platform === 'standalonewindows'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") PC - el-tag.x-tag-platform-quest(v-else-if="userDialog.ref.last_platform === 'android'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Quest + el-tag.x-tag-platform-quest(v-else-if="userDialog.ref.last_platform === 'android'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Android el-tag.x-tag-platform-ios(v-else-if="userDialog.ref.last_platform === 'ios'" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") iOS el-tag.x-tag-platform-other(v-else-if="userDialog.ref.last_platform" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ userDialog.ref.last_platform }} el-tag.name(v-if="userDialog.ref.$customTag" type="info" effect="plain" size="mini" v-text="userDialog.ref.$customTag" :style="{'color':userDialog.ref.$customTagColour, 'border-color':userDialog.ref.$customTagColour}" style="margin-right:5px;margin-top:5px") @@ -579,7 +579,7 @@ html el-tag(v-else-if="worldDialog.ref.releaseStatus === 'public'" type="success" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.public') }} el-tag(v-else type="danger" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.private') }} el-tag.x-tag-platform-pc(v-if="worldDialog.isPC" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") PC - el-tag.x-tag-platform-quest(v-if="worldDialog.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Quest + el-tag.x-tag-platform-quest(v-if="worldDialog.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Android el-tag.x-tag-platform-ios(v-if="worldDialog.isIos" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") iOS el-tag(v-if="worldDialog.avatarScalingDisabled" type="warning" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.avatar_scaling_disabled') }} el-tag(v-if="worldDialog.ref.unityPackageUrl" type="success" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.future_proofing') }} diff --git a/html/src/mixins/tabs/playerList.pug b/html/src/mixins/tabs/playerList.pug index 37117fcc..a60d399b 100644 --- a/html/src/mixins/tabs/playerList.pug +++ b/html/src/mixins/tabs/playerList.pug @@ -16,7 +16,7 @@ mixin playerListTab() el-tag(v-else-if="currentInstanceWorld.ref.releaseStatus === 'public'" type="success" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.world.tags.public') }} el-tag(v-else-if="currentInstanceWorld.ref.releaseStatus === 'private'" type="danger" effect="plain" size="mini" style="margin-right:5px") {{ $t('dialog.world.tags.private') }} el-tag.x-tag-platform-pc(v-if="currentInstanceWorld.isPC" type="info" effect="plain" size="mini" style="margin-right:5px") PC - el-tag.x-tag-platform-quest(v-if="currentInstanceWorld.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px") Quest + el-tag.x-tag-platform-quest(v-if="currentInstanceWorld.isQuest" type="info" effect="plain" size="mini" style="margin-right:5px") Android el-tag.x-tag-platform-ios(v-if="currentInstanceWorld.isIOS" type="info" effect="plain" size="mini" style="margin-right:5px") iOS el-tag(v-if="currentInstanceWorld.avatarScalingDisabled" type="warning" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.world.tags.avatar_scaling_disabled') }} el-tag(type="info" effect="plain" size="mini" v-text="currentInstanceWorld.fileSize" style="margin-right:5px") @@ -112,7 +112,7 @@ mixin playerListTab() span(v-else-if="scope.row.type === 'OnPlayerJoined'") span(v-if="scope.row.platform === 'Desktop'" style="color:#409eff") Desktop  span(v-else-if="scope.row.platform === 'VR'" style="color:#409eff") VR  - span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Quest  + span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Android  span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)") |   span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]  @@ -183,7 +183,7 @@ mixin playerListTab() span(v-else-if="scope.row.type === 'OnPlayerJoined'") span(v-if="scope.row.platform === 'Desktop'" style="color:#409eff") Desktop  span(v-else-if="scope.row.platform === 'VR'" style="color:#409eff") VR  - span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Quest  + span(v-else-if="scope.row.platform === 'Quest'" style="color:#67c23a") Android  span.x-link(v-text="scope.row.avatar.name" @click="showAvatarDialog(scope.row.avatar.id)") |   span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]  @@ -232,7 +232,7 @@ mixin playerListTab() template(v-once #default="scope") template(v-if="scope.row.ref.last_platform") span(v-if="scope.row.ref.last_platform === 'standalonewindows'" style="color:#409eff") PC - span(v-else-if="scope.row.ref.last_platform === 'android'" style="color:#67c23a") Q + span(v-else-if="scope.row.ref.last_platform === 'android'" style="color:#67c23a") A span(v-else-if="scope.row.ref.last_platform === 'ios'" style="color:#c7c7ce") iOS span(v-else) {{ scope.row.ref.last_platform }} template(v-if="scope.row.inVRMode !== null") diff --git a/html/src/mixins/tabs/settings.pug b/html/src/mixins/tabs/settings.pug index e2413ddf..20718a5c 100644 --- a/html/src/mixins/tabs/settings.pug +++ b/html/src/mixins/tabs/settings.pug @@ -384,11 +384,11 @@ mixin settingsTab() span.header {{ $t('view.settings.advanced.advanced.common_folders') }} div.options-container-item(style="margin-top:15px") el-button-group - el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcxAppDataFolder()") AppData (VRCX) - el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcAppDataFolder()") AppData - el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcPhotosFolder()") Photos - el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenVrcScreenshotsFolder()") Screenshots - el-button(size="small" icon="el-icon-folder" @click="AppApi.OpenCrashVrcCrashDumps()") Crash Dumps + el-button(size="small" icon="el-icon-folder" @click="openVrcxAppDataFolder()") AppData (VRCX) + el-button(size="small" icon="el-icon-folder" @click="openVrcAppDataFolder()") AppData + el-button(size="small" icon="el-icon-folder" @click="openVrcPhotosFolder()") Photos + el-button(size="small" icon="el-icon-folder" @click="openVrcScreenshotsFolder()") Screenshots + el-button(size="small" icon="el-icon-folder" @click="openCrashVrcCrashDumps()") Crash Dumps //- Advanced | Primary Password div.options-container //- Advanced | Primary Password Header