From 21b1ca72d0c0941bed507cabaa1b3e86aae4a846 Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Tue, 10 Sep 2024 22:41:59 -0400
Subject: [PATCH] Fix 2nd Patch for CustomSounds

First is broken still
---
 .../components/SoundOverrideComponent.tsx                     | 0
 .../{customSounds => customSounds.dev}/index.tsx              | 4 ++--
 .../{customSounds => customSounds.dev}/styles.css             | 0
 .../{customSounds => customSounds.dev}/types.ts               | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename src/equicordplugins/{customSounds => customSounds.dev}/components/SoundOverrideComponent.tsx (100%)
 rename src/equicordplugins/{customSounds => customSounds.dev}/index.tsx (97%)
 rename src/equicordplugins/{customSounds => customSounds.dev}/styles.css (100%)
 rename src/equicordplugins/{customSounds => customSounds.dev}/types.ts (100%)

diff --git a/src/equicordplugins/customSounds/components/SoundOverrideComponent.tsx b/src/equicordplugins/customSounds.dev/components/SoundOverrideComponent.tsx
similarity index 100%
rename from src/equicordplugins/customSounds/components/SoundOverrideComponent.tsx
rename to src/equicordplugins/customSounds.dev/components/SoundOverrideComponent.tsx
diff --git a/src/equicordplugins/customSounds/index.tsx b/src/equicordplugins/customSounds.dev/index.tsx
similarity index 97%
rename from src/equicordplugins/customSounds/index.tsx
rename to src/equicordplugins/customSounds.dev/index.tsx
index 57584d779..ad3348472 100644
--- a/src/equicordplugins/customSounds/index.tsx
+++ b/src/equicordplugins/customSounds.dev/index.tsx
@@ -55,7 +55,7 @@ export default definePlugin({
     patches: [
         // sound class
         {
-            find: 'Error("could not play audio")',
+            find: '"_ensureAudioPromise"',
             replacement: [
                 // override URL
                 {
@@ -64,7 +64,7 @@ export default definePlugin({
                 },
                 // override volume
                 {
-                    match: /Math.min\(\i\.\i\.getOutputVolume\(\)\/100\*this\._volume/,
+                    match: /Math.min\(\i\.\i\.getOutputVolume\(\).{0,20}volume/,
                     replace: "$& * ($self.findOverride(this.name)?.volume ?? 100) / 100"
                 }
             ]
diff --git a/src/equicordplugins/customSounds/styles.css b/src/equicordplugins/customSounds.dev/styles.css
similarity index 100%
rename from src/equicordplugins/customSounds/styles.css
rename to src/equicordplugins/customSounds.dev/styles.css
diff --git a/src/equicordplugins/customSounds/types.ts b/src/equicordplugins/customSounds.dev/types.ts
similarity index 100%
rename from src/equicordplugins/customSounds/types.ts
rename to src/equicordplugins/customSounds.dev/types.ts