diff --git a/AppApi.cs b/AppApi.cs index ed3ae28b..271d4b46 100644 --- a/AppApi.cs +++ b/AppApi.cs @@ -86,14 +86,6 @@ namespace VRCX Cef.GetGlobalCookieManager().DeleteCookies(); } - public string LoginWithSteam() - { - var rpc = VRChatRPC.Instance; - return rpc.Update() == true - ? rpc.GetAuthSessionTicket() - : string.Empty; - } - public bool[] CheckGameRunning() { var isGameRunning = false; @@ -200,8 +192,8 @@ namespace VRCX Process.Start(new ProcessStartInfo { WorkingDirectory = Path.GetDirectoryName(path), - FileName = path, - UseShellExecute = false, + FileName = path, + UseShellExecute = false, Arguments = arguments }).Close(); } diff --git a/VRCX.csproj b/VRCX.csproj index 442269b0..88c99ba9 100644 --- a/VRCX.csproj +++ b/VRCX.csproj @@ -1,4 +1,4 @@ - + @@ -212,7 +212,6 @@ - xcopy /y "$(ProjectDir)VRChatRPC\VRChatRPC.dll" . -xcopy /y "$(ProjectDir)OpenVR\win64\openvr_api.dll" + xcopy /y "$(ProjectDir)OpenVR\win64\openvr_api.dll" \ No newline at end of file diff --git a/VRChatRPC.cs b/VRChatRPC.cs deleted file mode 100644 index 5a283425..00000000 --- a/VRChatRPC.cs +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright(c) 2019-2022 pypy, Natsumi and individual contributors. -// All rights reserved. -// -// This work is licensed under the terms of the MIT license. -// For a copy, see . - -using System; -using System.Runtime.InteropServices; -using System.Text; - -namespace VRCX -{ - public class VRChatRPC - { - public static readonly VRChatRPC Instance; - - [DllImport("VRChatRPC", CallingConvention = CallingConvention.Cdecl)] - private static extern bool VRChatRPC_000(); - - [DllImport("VRChatRPC", CallingConvention = CallingConvention.Cdecl)] - private static extern int VRChatRPC_001([Out] byte[] data, int size); - - [DllImport("VRChatRPC", CallingConvention = CallingConvention.Cdecl)] - private static extern IntPtr VRChatRPC_002(); - - static VRChatRPC() - { - Instance = new VRChatRPC(); - } - - public bool Update() - { - return VRChatRPC_000(); - } - - public string GetAuthSessionTicket() - { - var a = new byte[1024]; - var n = VRChatRPC_001(a, 1024); - return BitConverter.ToString(a, 0, n).Replace("-", string.Empty); - } - - public string GetPersonaName() - { - var ptr = VRChatRPC_002(); - if (ptr != IntPtr.Zero) - { - int n = 0; - while (Marshal.ReadByte(ptr, n) != 0) - { - ++n; - } - if (n > 0) - { - var a = new byte[n]; - Marshal.Copy(ptr, a, 0, a.Length); - return Encoding.UTF8.GetString(a); - } - } - return string.Empty; - } - } -} diff --git a/VRChatRPC/README.txt b/VRChatRPC/README.txt deleted file mode 100644 index c9ec1e37..00000000 --- a/VRChatRPC/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -it grabs some data from VRChat process.. use at own risk. - -by pypy (mina#5656) \ No newline at end of file diff --git a/VRChatRPC/VRChatRPC.dll b/VRChatRPC/VRChatRPC.dll deleted file mode 100644 index 0a2df93a..00000000 Binary files a/VRChatRPC/VRChatRPC.dll and /dev/null differ diff --git a/html/src/app.js b/html/src/app.js index bda449ef..aa42ac0d 100644 --- a/html/src/app.js +++ b/html/src/app.js @@ -1181,33 +1181,6 @@ speechSynthesis.getVoices(); }); }; - /* - params: { - steamTicket: string - } - */ - API.loginWithSteam = function (params) { - return this.call( - `auth/steam?apiKey=${this.cachedConfig.clientApiKey}`, - { - method: 'POST', - params - } - ).then((json) => { - var args = { - json, - params, - origin: true - }; - if (json.requiresTwoFactorAuth) { - this.$emit('USER:2FA', args); - } else { - this.$emit('USER:CURRENT', args); - } - return args; - }); - }; - /* params: { code: string