From 0734e35a2b537555cd38501a98e2137b8d37e98b Mon Sep 17 00:00:00 2001 From: Natsumi Date: Mon, 16 Dec 2024 20:59:50 +1300 Subject: [PATCH] Lint --- Dotnet/AssetBundleCacher.cs | 3 +-- Dotnet/Program.cs | 12 +++++++----- html/src/mixins/dialogs/userDialog.pug | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dotnet/AssetBundleCacher.cs b/Dotnet/AssetBundleCacher.cs index 5ba70f4c..be159310 100644 --- a/Dotnet/AssetBundleCacher.cs +++ b/Dotnet/AssetBundleCacher.cs @@ -119,8 +119,7 @@ namespace VRCX var dirs = Directory.GetDirectories(topDir, versionSearchPattern); if (dirs.Length > 0) return dirs.OrderByDescending(dir => ReverseHexToDecimal(Path.GetFileName(dir)).Item2).First(); - - + return Path.Combine(topDir, versionLocation); } diff --git a/Dotnet/Program.cs b/Dotnet/Program.cs index da9bc0a6..fe64b33d 100644 --- a/Dotnet/Program.cs +++ b/Dotnet/Program.cs @@ -134,20 +134,22 @@ namespace VRCX } } #endregion + #region Handle Database Error catch (SQLiteException e) { - logger.Fatal(e, "Unhandled SQLite Exception, closing"); + logger.Fatal(e, "Unhandled SQLite Exception, closing."); var messageBoxResult = MessageBox.Show( - "An error which is related to your Database occured, this might indicate a broken database. " + - "You can go to https://github.com/vrcx-team/VRCX/wiki#how-to-repair-vrcx-database to find potential steps for resolving the issue. " + - "If the issue remains please join the Discord (https://vrcx.app/discord) to get further assistance. " + - "Would you like to open the Database repair steps page?\n" + + "A fatal database error has occured.\n" + + "Please try to repair your database by following the steps in the provided repair guide, or alternatively rename your \"%AppData%\\VRCX\" folder to reset VRCX. " + + "If the issue still persists after following the repair guide please join the Discord (https://vrcx.app/discord) for further assistance. " + + "Would you like to open the webpage for database repair steps?\n" + e, "Database error", MessageBoxButtons.YesNo, MessageBoxIcon.Error); if (messageBoxResult == DialogResult.Yes) { AppApi.Instance.OpenLink("https://github.com/vrcx-team/VRCX/wiki#how-to-repair-vrcx-database"); } } + #endregion catch (Exception e) { var cpuError = WinApi.GetCpuErrorMessage(); diff --git a/html/src/mixins/dialogs/userDialog.pug b/html/src/mixins/dialogs/userDialog.pug index a4826936..a401a36e 100644 --- a/html/src/mixins/dialogs/userDialog.pug +++ b/html/src/mixins/dialogs/userDialog.pug @@ -46,7 +46,7 @@ mixin userDialog() span(style="display:block;text-align:center;font-family:monospace") {{ API.currentUser.username | textToHex }} div(style="margin-top:5px") el-tag.name(type="info" effect="plain" size="mini" :class="userDialog.ref.$trustClass" v-text="userDialog.ref.$trustLevel" style="margin-right:5px;margin-top:5px") - el-tag.x-tag-friend(v-if="userDialog.isFriend && userDialog.friend" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.user.tags.friend_no', { number: userDialog.ref.$friendNumber ? userDialog.ref.$friendNumber : "?" }) }} + el-tag.x-tag-friend(v-if="userDialog.isFriend && userDialog.friend" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") {{ $t('dialog.user.tags.friend_no', { number: userDialog.ref.$friendNumber ?? : "?" }) }} el-tag.x-tag-troll(v-if="userDialog.ref.$isTroll" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Nuisance el-tag.x-tag-troll(v-if="userDialog.ref.$isProbableTroll" type="info" effect="plain" size="mini" style="margin-right:5px;margin-top:5px") Almost Nuisance 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') }}