refactor(background): simplify initIconAndBadgeUpdater (again)

WofWca · Jan 1, 2023 · 01cd0df · 01cd0df
1 parent 791236f
commit 01cd0df
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/src/entry-points/background/initIconAndBadgeUpdater.ts b/src/entry-points/background/initIconAndBadgeUpdater.ts
@@ -85,32 +85,30 @@ export default async function initIconAndBadgeUpdater(): Promise<void> {
   /**
    * @param changes - pass `null` to initialize.
    */
-  function handleSettingsChanges(changes: MyStorageChanges | null) {
+  function handleSettingsChanges(changes: MyStorageChanges) {
     if (changes) {
       Object.assign(settings, settingsChanges2NewValues(changes));
     }
 
     setIcon(settings);
 
-    if (changes) {
-      // TODO improvement: also display `video.volume` changes? Perhaps this script belongs to `content/main.ts`?
-      const orderedSetingsNames =
-        ['soundedSpeed', 'silenceSpeedRaw', 'volumeThreshold', 'marginBefore', 'marginAfter'] as const;
-      for (const settingName of orderedSetingsNames) {
-        const currSettingChange = changes[settingName];
-        if (currSettingChange) {
-          temporarelySetBadge(...settingToBadgeParams(settingName, currSettingChange.newValue!), settings);
-          break;
-        }
-      }
-      // TODO refactor: it would be cooler if we wrote the badge's dependencies more declaratively.
-      if (changes.badgeWhatSettingToDisplayByDefault || changes.enabled) {
-        setBadgeToDefault(settings);
+    // TODO improvement: also display `video.volume` changes? Perhaps this script belongs to `content/main.ts`?
+    const orderedSetingsNames =
+      ['soundedSpeed', 'silenceSpeedRaw', 'volumeThreshold', 'marginBefore', 'marginAfter'] as const;
+    for (const settingName of orderedSetingsNames) {
+      const currSettingChange = changes[settingName];
+      if (currSettingChange) {
+        temporarelySetBadge(...settingToBadgeParams(settingName, currSettingChange.newValue!), settings);
+        break;
       }
-    } else {
-      setBadgeToDefault(settings); // In case e.g. `settings.badgeWhatSettingToDisplayByDefault !== 'none'`
     }
+    // TODO refactor: it would be cooler if we wrote the badge's dependencies more declaratively.
+    if (changes.badgeWhatSettingToDisplayByDefault || changes.enabled) {
+      setBadgeToDefault(settings);
+    }
+    setBadgeToDefault(settings); // In case e.g. `settings.badgeWhatSettingToDisplayByDefault !== 'none'`
   }
-  handleSettingsChanges(null);
+  setBadgeToDefault(settings);
+  setIcon(settings);
   addOnStorageChangedListener(handleSettingsChanges);
 }