diff --git a/html/src/app.js b/html/src/app.js index 9ca8a0d3..bfcf4661 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -415,7 +415,7 @@ speechSynthesis.getVoices(); } return data; } - if ((status === 401) && (data.error.message === '"Missing Credentials"') && ($app.isAutoLogin)) { + if ((status === 401) && (data.error.message === '"Missing Credentials"')) { if (endpoint.substring(0, 10) === 'auth/user?') { this.$emit('AUTOLOGIN'); } @@ -5742,9 +5742,11 @@ speechSynthesis.getVoices(); (ctx.state === 'online')) { if (ctx.isVIP) { removeFromArray(this.friendsGroupA_, ctx); + this.sortFriendsGroup1 = true; this.friendsGroupA_.unshift(ctx); } else { removeFromArray(this.friendsGroupB_, ctx); + this.sortFriendsGroup0 = true; this.friendsGroupB_.unshift(ctx); } } @@ -6287,6 +6289,7 @@ speechSynthesis.getVoices(); $app.methods.resetGameLog = async function () { await gameLogService.reset(); + await gameLogService.poll(); this.gameLogTable.data = []; this.lastLocation = { date: 0, @@ -7588,18 +7591,15 @@ speechSynthesis.getVoices(); $app.data.isStartAtWindowsStartup = configRepository.getBool('VRCX_StartAtWindowsStartup'); $app.data.isStartAsMinimizedState = (VRCXStorage.Get('VRCX_StartAsMinimizedState') === 'true'); $app.data.isCloseToTray = configRepository.getBool('VRCX_CloseToTray'); - $app.data.isAutoLogin = configRepository.getBool('VRCX_AutoLogin'); var saveVRCXWindowOption = function () { configRepository.setBool('VRCX_StartAtWindowsStartup', this.isStartAtWindowsStartup); VRCXStorage.Set('VRCX_StartAsMinimizedState', this.isStartAsMinimizedState.toString()); configRepository.setBool('VRCX_CloseToTray', this.isCloseToTray); AppApi.SetStartup(this.isStartAtWindowsStartup); - configRepository.setBool('VRCX_AutoLogin', this.isAutoLogin); }; $app.watch.isStartAtWindowsStartup = saveVRCXWindowOption; $app.watch.isStartAsMinimizedState = saveVRCXWindowOption; $app.watch.isCloseToTray = saveVRCXWindowOption; - $app.watch.isAutoLogin = saveVRCXWindowOption; // setting defaults if (!configRepository.getString('VRCX_notificationPosition')) { diff --git a/html/src/index.pug b/html/src/index.pug index cd814f10..1f127a6f 100644 --- a/html/src/index.pug +++ b/html/src/index.pug @@ -486,11 +486,11 @@ html .detail span.name Two-Factor Auth (2FA) span.extra {{ API.currentUser.twoFactorAuthEnabled ? 'Enabled' : 'Disabled' }} - div(style="margin-top:10px") - el-button(size="small" icon="el-icon-switch-button" @click="logout()") Logout - el-button(size="small" icon="el-icon-printer" @click="showExportFriendsListDialog()") Export Friends List - el-button(size="small" icon="el-icon-user" @click="showExportAvatarsListDialog()") Export Own Avatars - el-button(size="small" icon="el-icon-chat-dot-round" @click="showDiscordNamesDialog()") Discord Names + div + el-button(size="small" icon="el-icon-switch-button" @click="logout()" style="margin-left:0;margin-right:5px;margin-top:10px") Logout + el-button(size="small" icon="el-icon-printer" @click="showExportFriendsListDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") Export Friends List + el-button(size="small" icon="el-icon-user" @click="showExportAvatarsListDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") Export Own Avatars + el-button(size="small" icon="el-icon-chat-dot-round" @click="showDiscordNamesDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") Discord Names div.options-container span.header Game Info .x-friend-list(style="margin-top:10px") @@ -859,9 +859,6 @@ html div.options-container-item span.name Close to tray el-switch(v-model="isCloseToTray") - div.options-container-item - span.name Auto login - el-switch(v-model="isAutoLogin") div.options-container-item el-button-group el-button(size="small" icon="el-icon-s-operation" @click="showLaunchOptions()") Launch Options @@ -1056,9 +1053,9 @@ html el-dropdown-item(icon="el-icon-s-custom" command="Show Fallback Avatar Details") Show Fallback Avatar Details el-dropdown-item(icon="el-icon-picture-outline" command="Previous Images") Show Avatar Previous Images el-dropdown-item(v-if="userDialog.isBlock" icon="el-icon-circle-check" command="Unblock" divided style="color:#F56C6C") Unblock - el-dropdown-item(v-else icon="el-icon-circle-close" command="Block" divided) Block + el-dropdown-item(v-else icon="el-icon-circle-close" command="Block" divided :disabled="userDialog.ref.$isModerator") Block el-dropdown-item(v-if="userDialog.isMute" icon="el-icon-microphone" command="Unmute" style="color:#F56C6C") Unmute - el-dropdown-item(v-else icon="el-icon-turn-off-microphone" command="Mute") Mute + el-dropdown-item(v-else icon="el-icon-turn-off-microphone" command="Mute" :disabled="userDialog.ref.$isModerator") Mute el-dropdown-item(v-if="userDialog.isHideAvatar" icon="el-icon-user-solid" command="Show Avatar" style="color:#F56C6C") Show Avatar el-dropdown-item(v-else icon="el-icon-user" command="Hide Avatar") Hide Avatar template(v-if="userDialog.isFriend")