From fe5e041db82aac7d2d975a7465e5441f05c8d97f Mon Sep 17 00:00:00 2001 From: V Date: Thu, 27 Jul 2023 01:56:45 +0200 Subject: [PATCH] VoiceMessages: Read file from dynamic path (fixes mac & linux support) --- src/VencordNative.ts | 2 +- src/main/ipcPlugins.ts | 13 +++++++++---- src/plugins/voiceMessages/DesktopRecorder.tsx | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/VencordNative.ts b/src/VencordNative.ts index 4e34f3d4..ed0686da 100644 --- a/src/VencordNative.ts +++ b/src/VencordNative.ts @@ -64,7 +64,7 @@ export default { resolveRedirect: (url: string) => invoke(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, url), }, VoiceMessages: { - readRecording: () => invoke(IpcEvents.VOICE_MESSAGES_READ_RECORDING), + readRecording: (path: string) => invoke(IpcEvents.VOICE_MESSAGES_READ_RECORDING, path), } } }; diff --git a/src/main/ipcPlugins.ts b/src/main/ipcPlugins.ts index 7ab4c25f..bcc0a1b5 100644 --- a/src/main/ipcPlugins.ts +++ b/src/main/ipcPlugins.ts @@ -20,7 +20,7 @@ import { IpcEvents } from "@utils/IpcEvents"; import { app, ipcMain } from "electron"; import { readFile } from "fs/promises"; import { request } from "https"; -import { join } from "path"; +import { basename, normalize } from "path"; // #region OpenInApp // These links don't support CORS, so this has to be native @@ -49,10 +49,15 @@ ipcMain.handle(IpcEvents.OPEN_IN_APP__RESOLVE_REDIRECT, async (_, url: string) = // #region VoiceMessages -ipcMain.handle(IpcEvents.VOICE_MESSAGES_READ_RECORDING, async () => { - const path = join(app.getPath("userData"), "module_data/discord_voice/recording.ogg"); +ipcMain.handle(IpcEvents.VOICE_MESSAGES_READ_RECORDING, async (_, filePath: string) => { + filePath = normalize(filePath); + const filename = basename(filePath); + const discordBaseDirWithTrailingSlash = normalize(app.getPath("userData") + "/"); + console.log(filename, discordBaseDirWithTrailingSlash, filePath); + if (filename !== "recording.ogg" || !filePath.startsWith(discordBaseDirWithTrailingSlash)) return null; + try { - const buf = await readFile(path); + const buf = await readFile(filePath); return new Uint8Array(buf.buffer); } catch { return null; diff --git a/src/plugins/voiceMessages/DesktopRecorder.tsx b/src/plugins/voiceMessages/DesktopRecorder.tsx index 176faf3c..36f6a60a 100644 --- a/src/plugins/voiceMessages/DesktopRecorder.tsx +++ b/src/plugins/voiceMessages/DesktopRecorder.tsx @@ -49,7 +49,7 @@ export const VoiceRecorderDesktop: VoiceRecorder = ({ setAudioBlob, onRecordingC } else { discordVoice.stopLocalAudioRecording(async (filePath: string) => { if (filePath) { - const buf = await VencordNative.pluginHelpers.VoiceMessages.readRecording(); + const buf = await VencordNative.pluginHelpers.VoiceMessages.readRecording(filePath); if (buf) setAudioBlob(new Blob([buf], { type: "audio/ogg; codecs=opus" })); else