diff --git a/Dotnet/Program.cs b/Dotnet/Program.cs index a4b20137..3ac8bf21 100644 --- a/Dotnet/Program.cs +++ b/Dotnet/Program.cs @@ -110,22 +110,21 @@ namespace VRCX { logger.Error(e, "Handled Exception, Missing file found in Handle Cef Explosion."); - var result = MessageBox.Show("VRCX Has encountered an error with the CefSharp backend, \nthis is typically caused by missing files or dependencies\nWould you like to try an autofix and automatically install vc_redist?.", "VRCX CefSharp not found.", MessageBoxButtons.YesNo, MessageBoxIcon.Error); - + var result = MessageBox.Show("VRCX has encountered an error with the CefSharp backend,\nthis is typically caused by missing files or dependencies.\nWould you like to try autofix by automatically installing vc_redist?.", "VRCX CefSharp not found.", MessageBoxButtons.YesNo, MessageBoxIcon.Error); switch (result) { case DialogResult.Yes: - logger.Fatal("Handled Exception, User selected auto install of vc_redist."); + logger.Fatal("Handled Exception, user selected auto install of vc_redist."); Update.DownloadInstallRedist(); MessageBox.Show( - "vc_redist has finished installing, if the issue continues upon next restart, please reinstall reinstall VRCX From GitHub,\nVRCX Will now restart.", "vc_redist installation complete", MessageBoxButtons.OK); + "vc_redist has finished installing, if the issue persists upon next restart, please reinstall VRCX From GitHub,\nVRCX Will now restart.", "vc_redist installation complete", MessageBoxButtons.OK); Thread.Sleep(5000); AppApi.Instance.RestartApplication(); break; case DialogResult.No: - logger.Fatal("Handled Exception, User choose manual."); - MessageBox.Show("VRCX will now close, try reinstalling VRCX from Github setup exe as a possible fix.", "VRCX CefSharp not found", MessageBoxButtons.OK, MessageBoxIcon.Error); + logger.Fatal("Handled Exception, user chose manual."); + MessageBox.Show("VRCX will now close, try reinstalling VRCX using the setup from Github as a potential fix.", "VRCX CefSharp not found", MessageBoxButtons.OK, MessageBoxIcon.Error); Thread.Sleep(5000); Environment.Exit(0); break; @@ -135,7 +134,7 @@ namespace VRCX catch (Exception e) { logger.Fatal(e, "Unhandled Exception, program dying"); - MessageBox.Show(e.ToString(), "PLEASE REPORT IN https://vrcx.pypy.moe/discord", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(e.ToString(), "PLEASE REPORT IN https://vrcx.app/discord", MessageBoxButtons.OK, MessageBoxIcon.Error); Environment.Exit(0); } } diff --git a/Installer/installer.nsi b/Installer/installer.nsi index 783a90be..21c93681 100644 --- a/Installer/installer.nsi +++ b/Installer/installer.nsi @@ -140,15 +140,11 @@ Section "Install" SecInstall noupgrade: - afterupgrade: - - ReadRegStr $R0 HKLM "SOFTWARE\Classes\Installer\Dependencies\Microsoft.VS.VC_RuntimeMinimumVSU_amd64,v14" "Version" - IfErrors 0 VSRedistInstalled - inetc::get "https://aka.ms/vs/17/release/vc_redist.x64.exe" $TEMP\vcredist_x64.exe ExecWait "$TEMP\vcredist_x64.exe /install /quiet /norestart" Delete "$TEMP\vcredist_x64.exe" - VSRedistInstalled: + + afterupgrade: SetOutPath "$INSTDIR" diff --git a/LICENSE b/LICENSE index c19d0514..04eff77a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 pypy +Copyright (c) 2019 pypy & Natsumi Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/html/src/app.js b/html/src/app.js index d29be318..b841482e 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -14901,31 +14901,29 @@ speechSynthesis.getVoices(); ) return; - if (!this.checkCanInvite(currentLocation)) - return; + if (!this.checkCanInvite(currentLocation)) return; var L = this.parseLocation(currentLocation); - - try { - this.getCachedWorld({ - worldId: L.worldId - }).then((args1) => { - this.sendInvite( - { - instanceId: L.tag, - worldId: L.tag, - worldName: args1.ref.name, - rsvp: true - }, - ref.senderUserId - ).then((_args) => { + this.getCachedWorld({ + worldId: L.worldId + }).then((args1) => { + this.sendInvite( + { + instanceId: L.tag, + worldId: L.tag, + worldName: args1.ref.name, + rsvp: true + }, + ref.senderUserId + ) + .then((_args) => { $app.$message(`Auto invite sent to ${ref.senderUsername}`); return _args; + }) + .catch((err) => { + console.error(err); }); - }); - } catch (err) { - console.error(err); - } + }); }); $app.data.unseenNotifications = []; @@ -22432,12 +22430,18 @@ speechSynthesis.getVoices(); $app.watch.friendsListBulkUnfriendMode = (newV) => { if (!newV) { - $app.friendsListTable.data.forEach(i => delete i.$selected); + $app.friendsListTable.data.forEach((i) => delete i.$selected); } - } + }; + $app.methods.showBulkUnfriendSelectionConfirm = function () { var pendingUnfriendList = this.friendsListTable.data.reduce( - (acc, ctx, i) => (ctx.$selected && acc.push(ctx.displayName), acc), + (acc, ctx) => { + if (ctx.$selected) { + acc.push(ctx.displayName); + } + return acc; + }, [] ); var elementsTicked = pendingUnfriendList.length;