From d136c33a872521c91308bb8b005daa31792f1c5f Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 25 Jan 2019 09:04:56 -0700
Subject: [PATCH] Invert setting values in a common place

---
 src/settings/SettingsStore.js | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/src/settings/SettingsStore.js b/src/settings/SettingsStore.js
index e7d4a679da..b56483c457 100644
--- a/src/settings/SettingsStore.js
+++ b/src/settings/SettingsStore.js
@@ -228,24 +228,18 @@ export default class SettingsStore {
 
         // Check if we need to invert the setting at all. Do this after we get the setting
         // handlers though, otherwise we'll fail to read the value.
-        let inverted = false;
         if (setting.invertedSettingName) {
             //console.warn(`Inverting ${settingName} to be ${setting.invertedSettingName} - legacy setting`);
             settingName = setting.invertedSettingName;
-            inverted = true;
         }
 
         if (explicit) {
             const handler = handlers[level];
             if (!handler) {
-                let value = SettingsStore._tryControllerOverride(setting, level, roomId, null, null);
-                if (inverted) value = !value;
-                return value;
+                return SettingsStore._getFinalValue(setting, level, roomId, null, null);
             }
             let value = handler.getValue(settingName, roomId);
-            value = SettingsStore._tryControllerOverride(setting, level, roomId, value, level);
-            if (inverted) value = !value;
-            return value;
+            return SettingsStore._getFinalValue(setting, level, roomId, value, level);
         }
 
         for (let i = minIndex; i < levelOrder.length; i++) {
@@ -255,23 +249,22 @@ export default class SettingsStore {
 
             let value = handler.getValue(settingName, roomId);
             if (value === null || value === undefined) continue;
-            value = SettingsStore._tryControllerOverride(setting, level, roomId, value, levelOrder[i]);
-            if (inverted) value = !value;
-            return value;
+            return SettingsStore._getFinalValue(setting, level, roomId, value, levelOrder[i]);
         }
 
-        let value = SettingsStore._tryControllerOverride(setting, level, roomId, null, null);
-        if (inverted) value = !value;
-        return value;
+        return SettingsStore._getFinalValue(setting, level, roomId, null, null);
     }
 
-    static _tryControllerOverride(setting, level, roomId, calculatedValue, calculatedAtLevel) {
-        const controller = setting.controller;
-        if (!controller) return calculatedValue;
+    static _getFinalValue(setting, level, roomId, calculatedValue, calculatedAtLevel) {
+        let resultingValue = calculatedValue;
 
-        const actualValue = controller.getValueOverride(level, roomId, calculatedValue, calculatedAtLevel);
-        if (actualValue !== undefined && actualValue !== null) return actualValue;
-        return calculatedValue;
+        if (setting.controller) {
+            const actualValue = setting.controller.getValueOverride(level, roomId, calculatedValue, calculatedAtLevel);
+            if (actualValue !== undefined && actualValue !== null) resultingValue = actualValue;
+        }
+
+        if (setting.invertedSettingName) resultingValue = !resultingValue;
+        return resultingValue;
     }
 
     /* eslint-disable valid-jsdoc */ //https://github.com/eslint/eslint/issues/7307