From f0240ec3457aff627b56d75876a8ed9fc8a98a5d Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Sat, 7 Jan 2023 22:15:22 -0300
Subject: [PATCH] chore(plugins): Fix IgnoreActivities & clean up other plugins
 (#384)

---
 ...ableDMCallIdle.ts => disableDMCallIdle.ts} |  0
 src/plugins/ignoreActivities.tsx              | 16 +++++++--------
 src/plugins/volumeBooster.ts                  | 20 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)
 rename src/plugins/{DisableDMCallIdle.ts => disableDMCallIdle.ts} (100%)

diff --git a/src/plugins/DisableDMCallIdle.ts b/src/plugins/disableDMCallIdle.ts
similarity index 100%
rename from src/plugins/DisableDMCallIdle.ts
rename to src/plugins/disableDMCallIdle.ts
diff --git a/src/plugins/ignoreActivities.tsx b/src/plugins/ignoreActivities.tsx
index a85e501..cfaaafd 100644
--- a/src/plugins/ignoreActivities.tsx
+++ b/src/plugins/ignoreActivities.tsx
@@ -35,7 +35,7 @@ interface IgnoredActivity {
 }
 
 const RegisteredGamesClasses = findByPropsLazy("overlayToggleIconOff", "overlayToggleIconOn");
-const PreviewBadgeClasses = findByPropsLazy("previewBadge", "previewBadgeIcon");
+const TryItOutClasses = findByPropsLazy("tryItOutBadge", "tryItOutBadgeIcon");
 const BaseShapeRoundClasses = findByPropsLazy("baseShapeRound", "baseShapeRoundLeft", "baseShapeRoundRight");
 const RunningGameStore = findByPropsLazy("getRunningGames", "getGamesSeen");
 
@@ -116,7 +116,7 @@ function ToggleActivityComponent({ activity }: { activity: IgnoredActivity; }) {
 function ToggleActivityComponentWithBackground({ activity }: { activity: IgnoredActivity; }) {
     return (
         <div
-            className={`${PreviewBadgeClasses.previewBadge} ${BaseShapeRoundClasses.baseShapeRound}`}
+            className={`${TryItOutClasses.tryItOutBadge} ${BaseShapeRoundClasses.baseShapeRound}`}
             style={{ padding: "0 2px" }}
         >
             <ToggleActivityComponent activity={activity} />
@@ -145,11 +145,11 @@ export default definePlugin({
     patches: [{
         find: ".Messages.SETTINGS_GAMES_OVERLAY_ON",
         replacement: {
-            match: /(this.renderLastPlayed\(\)]}\),this.renderOverlayToggle\(\))/,
-            replace: "$1,Vencord.Plugins.plugins.IgnoreActivities.renderToggleGameActivityButton(this.props)"
+            match: /this.renderLastPlayed\(\)]}\),this.renderOverlayToggle\(\)/,
+            replace: "$&,Vencord.Plugins.plugins.IgnoreActivities.renderToggleGameActivityButton(this.props)"
         }
     }, {
-        find: ".Messages.NEW,name",
+        find: ".overlayBadge",
         replacement: {
             match: /.badgeContainer.+?.\?\(0,.\.jsx\)\(.{1,2},{name:(?<props>.)\.name}\):null/,
             replace: "$&,Vencord.Plugins.plugins.IgnoreActivities.renderToggleActivityButton($<props>)"
@@ -157,8 +157,8 @@ export default definePlugin({
     }, {
         find: '.displayName="LocalActivityStore"',
         replacement: {
-            match: /((.)\.push\(.\({type:.\..{1,3}\.LISTENING.+?;)/,
-            replace: "$1$2=$2.filter(Vencord.Plugins.plugins.IgnoreActivities.isActivityEnabled);"
+            match: /(?<activities>.)\.push\(.\({type:.\..{1,3}\.LISTENING.+?\)\)/,
+            replace: "$&;$<activities>=$<activities>.filter(Vencord.Plugins.plugins.IgnoreActivities.isActivityIgnored);"
         }
     }],
 
@@ -207,7 +207,7 @@ export default definePlugin({
         );
     },
 
-    isActivityEnabled(props: { type: number; application_id?: string; name?: string; }) {
+    isActivityIgnored(props: { type: number; application_id?: string; name?: string; }) {
         if (props.type === 0) {
             if (props.application_id !== undefined) return !ignoredActivitiesCache.has(props.application_id);
             else {
diff --git a/src/plugins/volumeBooster.ts b/src/plugins/volumeBooster.ts
index dab6b93..49d9d54 100644
--- a/src/plugins/volumeBooster.ts
+++ b/src/plugins/volumeBooster.ts
@@ -29,21 +29,21 @@ export default definePlugin({
         {
             find: ".Messages.USER_VOLUME",
             replacement: {
-                match: /maxValue:(.{1,2}\..{1,2})\?(\d+?):(\d+?),/,
-                replace: (_, defaultMaxVolumePredicate, higherMaxVolume, minorMaxVolume) => ""
-                    + `maxValue:${defaultMaxVolumePredicate}`
-                    + `?${higherMaxVolume}*Vencord.Settings.plugins.VolumeBooster.multiplier`
-                    + `:${minorMaxVolume}*Vencord.Settings.plugins.VolumeBooster.multiplier,`
+                match: /maxValue:(?<defaultMaxVolumePredicate>.{1,2}\..{1,2})\?(?<higherMaxVolume>\d+?):(?<minorMaxVolume>\d+?),/,
+                replace: ""
+                    + "maxValue:$<defaultMaxVolumePredicate>"
+                    + "?$<higherMaxVolume>*Vencord.Settings.plugins.VolumeBooster.multiplier"
+                    + ":$<minorMaxVolume>*Vencord.Settings.plugins.VolumeBooster.multiplier,"
             }
         },
         {
             find: "currentVolume:",
             replacement: {
-                match: /maxValue:(.{1,2}\..{1,2})\?(\d+?):(\d+?),/,
-                replace: (_, defaultMaxVolumePredicate, higherMaxVolume, minorMaxVolume) => ""
-                    + `maxValue:${defaultMaxVolumePredicate}`
-                    + `?${higherMaxVolume}*Vencord.Settings.plugins.VolumeBooster.multiplier`
-                    + `:${minorMaxVolume}*Vencord.Settings.plugins.VolumeBooster.multiplier,`
+                match: /maxValue:(?<defaultMaxVolumePredicate>.{1,2}\..{1,2})\?(?<higherMaxVolume>\d+?):(?<minorMaxVolume>\d+?),/,
+                replace: ""
+                    + "maxValue:$<defaultMaxVolumePredicate>"
+                    + "?$<higherMaxVolume>*Vencord.Settings.plugins.VolumeBooster.multiplier"
+                    + ":$<minorMaxVolume>*Vencord.Settings.plugins.VolumeBooster.multiplier,"
             }
         }
     ],