From 37da8ded0aee1123fb6a9098567236f63ff326bf Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 25 Dec 2025 22:04:43 -0500
Subject: [PATCH] migratePluginToSettings: Update

---
 src/api/Settings.ts                          | 11 +++++------
 src/equicordplugins/betterUserArea/index.ts  |  4 +---
 src/equicordplugins/exportMessages/index.tsx |  3 +--
 src/equicordplugins/musicControls/index.tsx  |  3 ---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 074d14834..edf070b42 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -256,16 +256,15 @@ export function migratePluginToSettings(newName: string, oldName: string, ...set
     const newPlugin = plugins[newName];
     const oldPlugin = plugins[oldName];
 
-    if (!newPlugin || !oldPlugin) return;
-
-    if (oldPlugin?.enabled) {
+    if (newPlugin && oldPlugin?.enabled) {
         for (const settingName of settingNames) {
             logger.info(`Migrating plugin to setting from old name ${oldName} to ${newName} as ${settingName}`);
             newPlugin[settingName] = true;
-            newPlugin.enabled = true;
-            delete plugins[oldName];
-            SettingsStore.markAsChanged();
         }
+
+        newPlugin.enabled = true;
+        delete plugins[oldName];
+        SettingsStore.markAsChanged();
     }
 }
 
diff --git a/src/equicordplugins/betterUserArea/index.ts b/src/equicordplugins/betterUserArea/index.ts
index 77e9ac57c..213ebe48c 100644
--- a/src/equicordplugins/betterUserArea/index.ts
+++ b/src/equicordplugins/betterUserArea/index.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { definePluginSettings, migratePluginToSettings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import { EquicordDevs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
 
@@ -47,8 +47,6 @@ const settings = definePluginSettings({
     }
 });
 
-migratePluginToSettings("BetterUserArea", "CleanUserArea", "removeNameplate");
-
 export default definePlugin({
     name: "BetterUserArea",
     description: "Customize and make the user area more clean.",
diff --git a/src/equicordplugins/exportMessages/index.tsx b/src/equicordplugins/exportMessages/index.tsx
index 193dbb400..d2d3d68f5 100644
--- a/src/equicordplugins/exportMessages/index.tsx
+++ b/src/equicordplugins/exportMessages/index.tsx
@@ -7,7 +7,7 @@
 import "./styles.css";
 
 import { showNotification } from "@api/Notifications";
-import { definePluginSettings, migratePluginToSettings } from "@api/Settings";
+import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { copyToClipboard } from "@utils/clipboard";
 import { EquicordDevs } from "@utils/constants";
@@ -19,7 +19,6 @@ import { Menu, Toasts } from "@webpack/common";
 
 import { ContactsList } from "./types";
 
-migratePluginToSettings("ExportMessages", "ExportContacts", "exportContacts");
 const settings = definePluginSettings({
     openFileAfterExport: {
         type: OptionType.BOOLEAN,
diff --git a/src/equicordplugins/musicControls/index.tsx b/src/equicordplugins/musicControls/index.tsx
index baee27b33..f90b7ac7c 100644
--- a/src/equicordplugins/musicControls/index.tsx
+++ b/src/equicordplugins/musicControls/index.tsx
@@ -18,7 +18,6 @@
 
 import "./styles.css";
 
-import { migratePluginToSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs, EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
@@ -31,8 +30,6 @@ import { TidalLyrics } from "./tidal/lyrics/components/lyrics";
 import { TidalPlayer } from "./tidal/TidalPlayer";
 import { YtmPlayer } from "./youtubeMusic/PlayerComponent";
 
-migratePluginToSettings("MusicControls", "SpotifyControls", "showSpotifyControls");
-migratePluginToSettings("MusicControls", "SpotifyLyrics", "showSpotifyLyrics");
 export default definePlugin({
     name: "MusicControls",
     description: "Music Controls and Lyrics for multiple services ",