From 1b465d8f27682258cc59a60d03110cf1c2c02ac1 Mon Sep 17 00:00:00 2001
From: Nerivec <62446222+Nerivec@users.noreply.github.com>
Date: Thu, 28 Nov 2024 20:47:10 +0100
Subject: [PATCH] fix: Cleanup leftover legacy settings logic (#24947)

---
 lib/util/settings.ts                  | 37 +++++++++------------------
 test/extensions/homeassistant.test.ts |  4 +--
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/lib/util/settings.ts b/lib/util/settings.ts
index 4430bdc30a..7f2485a58c 100644
--- a/lib/util/settings.ts
+++ b/lib/util/settings.ts
@@ -115,24 +115,12 @@ function loadSettingsWithDefaults(): void {
             status_topic: 'hass/status',
             experimental_event_entities: false,
         };
-        const sLegacy = {};
-
-        if (_settingsWithDefaults.advanced) {
-            for (const key of ['homeassistant_discovery_topic', 'homeassistant_status_topic']) {
-                // @ts-expect-error ignore typing
-                if (_settingsWithDefaults.advanced[key] !== undefined) {
-                    // @ts-expect-error ignore typing
-                    sLegacy[key.replace('homeassistant_', '')] = _settingsWithDefaults.advanced[key];
-                }
-            }
-        }
-
         const s = typeof _settingsWithDefaults.homeassistant === 'object' ? _settingsWithDefaults.homeassistant : {};
         // @ts-expect-error ignore typing
         _settingsWithDefaults.homeassistant = {};
 
         // @ts-expect-error ignore typing
-        objectAssignDeep(_settingsWithDefaults.homeassistant, defaults, sLegacy, s);
+        objectAssignDeep(_settingsWithDefaults.homeassistant, defaults, s);
     }
 
     if (_settingsWithDefaults.availability) {
@@ -338,7 +326,7 @@ function read(): Settings {
             s[type] = {};
             for (const file of files) {
                 const content = yaml.readIfExists(data.joinPath(file));
-                /* eslint-disable-line */ // @ts-expect-error
+                // @ts-expect-error noMutate not typed properly
                 s[type] = objectAssignDeep.noMutate(s[type], content);
             }
         }
@@ -370,23 +358,22 @@ function applyEnvironmentVariables(settings: Partial<Settings>): void {
 
                         if (type.indexOf('object') >= 0 || type.indexOf('array') >= 0) {
                             try {
-                                // @ts-expect-error ignore typing
-                                setting[key] = JSON.parse(envVariable);
+                                setting[key as keyof Settings] = JSON.parse(envVariable);
                             } catch {
-                                // @ts-expect-error ignore typing
-                                setting[key] = envVariable;
+                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                setting[key as keyof Settings] = envVariable as any;
                             }
                         } else if (type.indexOf('number') >= 0) {
-                            // @ts-expect-error ignore typing
-                            setting[key] = (envVariable as unknown as number) * 1;
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            setting[key as keyof Settings] = ((envVariable as unknown as number) * 1) as any;
                         } else if (type.indexOf('boolean') >= 0) {
-                            // @ts-expect-error ignore typing
-                            setting[key] = envVariable.toLowerCase() === 'true';
+                            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                            setting[key as keyof Settings] = (envVariable.toLowerCase() === 'true') as any;
                         } else {
                             /* istanbul ignore else */
                             if (type.indexOf('string') >= 0) {
-                                // @ts-expect-error ignore typing
-                                setting[key] = envVariable;
+                                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                                setting[key as keyof Settings] = envVariable as any;
                             }
                         }
                     }
@@ -446,7 +433,7 @@ export function set(path: string[], value: string | number | boolean | KeyValue)
 
 export function apply(settings: Record<string, unknown>): boolean {
     getInternalSettings(); // Ensure _settings is initialized.
-    // @ts-expect-error ignore typing
+    // @ts-expect-error noMutate not typed properly
     const newSettings = objectAssignDeep.noMutate(_settings, settings);
     utils.removeNullPropertiesFromObject(newSettings, NULLABLE_SETTINGS);
     ajvSetting(newSettings);
diff --git a/test/extensions/homeassistant.test.ts b/test/extensions/homeassistant.test.ts
index 672ae859ce..6f23e8354c 100644
--- a/test/extensions/homeassistant.test.ts
+++ b/test/extensions/homeassistant.test.ts
@@ -1001,8 +1001,8 @@ describe('Extension: HomeAssistant', () => {
         });
     });
 
-    it('Should discover devices with custom homeassistant_discovery_topic', async () => {
-        settings.set(['advanced', 'homeassistant_discovery_topic'], 'my_custom_discovery_topic');
+    it('Should discover devices with custom homeassistant.discovery_topic', async () => {
+        settings.set(['homeassistant'], {discovery_topic: 'my_custom_discovery_topic'});
         await resetExtension();
 
         const payload = {