Convert feature setting usages to regular settings

src/FromWidgetPostMessageApi.js

@@ -197,7 +197,7 @@ export default class FromWidgetPostMessageApi {
             const integId = (data && data.integId) ? data.integId : null;
 
             // TODO: Open the right integration manager for the widget
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 IntegrationManagers.sharedInstance().openAll(
                     MatrixClientPeg.get().getRoom(RoomViewStore.getRoomId()),
                     `type_${integType}`,

src/components/structures/LeftPanel.tsx

@@ -377,7 +377,7 @@ export default class LeftPanel extends React.Component<IProps, IState> {
         const tagPanel = !this.state.showTagPanel ? null : (
             <div className="mx_LeftPanel_tagPanelContainer">
                 <TagPanel/>
-                {SettingsStore.isFeatureEnabled("feature_custom_tags") ? <CustomRoomTagPanel /> : null}
+                {SettingsStore.getValue("feature_custom_tags") ? <CustomRoomTagPanel /> : null}
             </div>
         );
 

src/components/views/avatars/MemberStatusMessageAvatar.js

@@ -53,7 +53,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
         if (this.props.member.userId !== MatrixClientPeg.get().getUserId()) {
             throw new Error("Cannot use MemberStatusMessageAvatar on anyone but the logged in user");
         }
-        if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (!SettingsStore.getValue("feature_custom_status")) {
             return;
         }
         const { user } = this.props.member;
@@ -105,7 +105,7 @@ export default class MemberStatusMessageAvatar extends React.Component {
             resizeMethod={this.props.resizeMethod}
         />;
 
-        if (!SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (!SettingsStore.getValue("feature_custom_status")) {
             return avatar;
         }
 

src/components/views/context_menus/MessageContextMenu.js

@@ -81,7 +81,7 @@ export default createReactClass({
         let canPin = room.currentState.mayClientSendStateEvent('m.room.pinned_events', cli);
 
         // HACK: Intentionally say we can't pin if the user doesn't want to use the functionality
-        if (!SettingsStore.isFeatureEnabled("feature_pinning")) canPin = false;
+        if (!SettingsStore.getValue("feature_pinning")) canPin = false;
 
         this.setState({canRedact, canPin});
     },

src/components/views/dialogs/RoomSettingsDialog.js

@@ -87,7 +87,7 @@ export default class RoomSettingsDialog extends React.Component {
             <NotificationSettingsTab roomId={this.props.roomId} />,
         ));
 
-        if (SettingsStore.isFeatureEnabled("feature_bridge_state")) {
+        if (SettingsStore.getValue("feature_bridge_state")) {
             tabs.push(new Tab(
                 ROOM_BRIDGES_TAB,
                 _td("Bridges"),

src/components/views/dialogs/UserSettingsDialog.js

@@ -54,7 +54,7 @@ export default class UserSettingsDialog extends React.Component {
         super();
 
         this.state = {
-            mjolnirEnabled: SettingsStore.isFeatureEnabled("feature_mjolnir"),
+            mjolnirEnabled: SettingsStore.getValue("feature_mjolnir"),
         };
     }
 

src/components/views/elements/AppTile.js

@@ -311,7 +311,7 @@ export default class AppTile extends React.Component {
             this.props.onEditClick();
         } else {
             // TODO: Open the right manager for the widget
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 IntegrationManagers.sharedInstance().openAll(
                     this.props.room,
                     'type_' + this.props.app.type,

src/components/views/elements/InlineSpinner.js

@@ -28,7 +28,7 @@ export default createReactClass({
         const imgClass = this.props.imgClassName || "";
 
         let imageSource;
-        if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
+        if (SettingsStore.getValue('feature_new_spinner')) {
             imageSource = require("../../../../res/img/spinner.svg");
         } else {
             imageSource = require("../../../../res/img/spinner.gif");

src/components/views/elements/ManageIntegsButton.js

@@ -34,7 +34,7 @@ export default class ManageIntegsButton extends React.Component {
         if (!managers.hasManager()) {
             managers.openNoManagerDialog();
         } else {
-            if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+            if (SettingsStore.getValue("feature_many_integration_managers")) {
                 managers.openAll(this.props.room);
             } else {
                 managers.getPrimaryManager().open(this.props.room);

src/components/views/elements/Spinner.js

@@ -22,7 +22,7 @@ import SettingsStore from "../../../settings/SettingsStore";
 
 const Spinner = ({w = 32, h = 32, imgClassName, message}) => {
     let imageSource;
-    if (SettingsStore.isFeatureEnabled('feature_new_spinner')) {
+    if (SettingsStore.getValue('feature_new_spinner')) {
         imageSource = require("../../../../res/img/spinner.svg");
     } else {
         imageSource = require("../../../../res/img/spinner.gif");

src/components/views/messages/MessageEvent.js

@@ -95,7 +95,7 @@ export default createReactClass({
             }
         }
 
-        if (SettingsStore.isFeatureEnabled("feature_mjolnir")) {
+        if (SettingsStore.getValue("feature_mjolnir")) {
             const key = `mx_mjolnir_render_${this.props.mxEvent.getRoomId()}__${this.props.mxEvent.getId()}`;
             const allowRender = localStorage.getItem(key) === "true";
 

src/components/views/right_panel/UserInfo.js

@@ -1428,7 +1428,7 @@ const UserInfoHeader = ({onClose, member, e2eStatus}) => {
         presenceLastActiveAgo = member.user.lastActiveAgo;
         presenceCurrentlyActive = member.user.currentlyActive;
 
-        if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (SettingsStore.getValue("feature_custom_status")) {
             statusMessage = member.user._unstable_statusMessage;
         }
     }

src/components/views/rooms/AppsDrawer.js

@@ -130,7 +130,7 @@ export default createReactClass({
     },
 
     _launchManageIntegrations: function() {
-        if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+        if (SettingsStore.getValue("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll();
         } else {
             IntegrationManagers.sharedInstance().getPrimaryManager().open(this.props.room, 'add_integ');

src/components/views/rooms/AuxPanel.js

@@ -104,7 +104,7 @@ export default createReactClass({
     },
 
     _rateLimitedUpdate: new RateLimitedFunc(function() {
-        if (SettingsStore.isFeatureEnabled("feature_state_counters")) {
+        if (SettingsStore.getValue("feature_state_counters")) {
             this.setState({counters: this._computeCounters()});
         }
     }, 500),
@@ -112,7 +112,7 @@ export default createReactClass({
     _computeCounters: function() {
         let counters = [];
 
-        if (this.props.room && SettingsStore.isFeatureEnabled("feature_state_counters")) {
+        if (this.props.room && SettingsStore.getValue("feature_state_counters")) {
             const stateEvs = this.props.room.currentState.getStateEvents('re.jki.counter');
             stateEvs.sort((a, b) => {
                 return a.getStateKey() < b.getStateKey();
@@ -206,7 +206,7 @@ export default createReactClass({
         />;
 
         let stateViews = null;
-        if (this.state.counters && SettingsStore.isFeatureEnabled("feature_state_counters")) {
+        if (this.state.counters && SettingsStore.getValue("feature_state_counters")) {
             let counters = [];
 
             this.state.counters.forEach((counter, idx) => {

src/components/views/rooms/MemberTile.js

@@ -50,7 +50,7 @@ export default createReactClass({
     componentDidMount() {
         const cli = MatrixClientPeg.get();
 
-        if (SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (SettingsStore.getValue("feature_custom_status")) {
             const { user } = this.props.member;
             if (user) {
                 user.on("User._unstable_statusMessage", this._onStatusMessageCommitted);
@@ -209,7 +209,7 @@ export default createReactClass({
         const presenceState = member.user ? member.user.presence : null;
 
         let statusMessage = null;
-        if (member.user && SettingsStore.isFeatureEnabled("feature_custom_status")) {
+        if (member.user && SettingsStore.getValue("feature_custom_status")) {
             statusMessage = this.state.statusMessage;
         }
 

src/components/views/rooms/RoomHeader.js

@@ -226,7 +226,7 @@ export default createReactClass({
                     title={_t("Settings")} />;
         }
 
-        if (this.props.onPinnedClick && SettingsStore.isFeatureEnabled('feature_pinning')) {
+        if (this.props.onPinnedClick && SettingsStore.getValue('feature_pinning')) {
             let pinsIndicator = null;
             if (this._hasUnreadPins()) {
                 pinsIndicator = (<div className="mx_RoomHeader_pinsIndicator mx_RoomHeader_pinsIndicatorUnread" />);

src/components/views/rooms/Stickerpicker.js

@@ -363,7 +363,7 @@ export default class Stickerpicker extends React.Component {
      */
     _launchManageIntegrations() {
         // TODO: Open the right integration manager for the widget
-        if (SettingsStore.isFeatureEnabled("feature_many_integration_managers")) {
+        if (SettingsStore.getValue("feature_many_integration_managers")) {
             IntegrationManagers.sharedInstance().openAll(
                 this.props.room,
                 `type_${WidgetType.STICKERPICKER.preferred}`,

src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx

@@ -237,7 +237,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         }
 
         let customThemeForm: JSX.Element;
-        if (SettingsStore.isFeatureEnabled("feature_custom_themes")) {
+        if (SettingsStore.getValue("feature_custom_themes")) {
             let messageElement = null;
             if (this.state.customThemeMessage.text) {
                 if (this.state.customThemeMessage.isError) {

src/components/views/settings/tabs/user/LabsUserSettingsTab.js

@@ -34,7 +34,7 @@ export class LabsSettingToggle extends React.Component {
 
     render() {
         const label = SettingsStore.getDisplayName(this.props.featureId);
-        const value = SettingsStore.isFeatureEnabled(this.props.featureId);
+        const value = SettingsStore.getValue(this.props.featureId);
         return <LabelledToggleSwitch value={value} label={label} onChange={this._onChange} />;
     }
 }

src/hooks/useSettings.ts

@@ -36,11 +36,11 @@ export const useSettingValue = (settingName: string, roomId: string = null, excl
 
 // Hook to fetch whether a feature is enabled and dynamically update when that changes
 export const useFeatureEnabled = (featureName: string, roomId: string = null) => {
-    const [enabled, setEnabled] = useState(SettingsStore.isFeatureEnabled(featureName, roomId));
+    const [enabled, setEnabled] = useState(SettingsStore.getValue(featureName, roomId));
 
     useEffect(() => {
         const ref = SettingsStore.watchSetting(featureName, roomId, () => {
-            setEnabled(SettingsStore.isFeatureEnabled(featureName, roomId));
+            setEnabled(SettingsStore.getValue(featureName, roomId));
         });
         // clean-up
         return () => {

src/rageshake/submit-rageshake.ts

@@ -143,7 +143,7 @@ export default async function sendBugReport(bugReportEndpoint: string, opts: IOp
     }
 
     // add labs options
-    const enabledLabs = SettingsStore.getLabsFeatures().filter(f => SettingsStore.isFeatureEnabled(f));
+    const enabledLabs = SettingsStore.getLabsFeatures().filter(f => SettingsStore.getValue(f));
     if (enabledLabs.length) {
         body.append('enabled_labs', enabledLabs.join(', '));
     }

src/settings/SettingsStore.ts

@@ -240,19 +240,6 @@ export default class SettingsStore {
         return _t(displayName as string);
     }
 
-    /**
-     * Returns a list of all available labs feature names
-     * @returns {string[]} The list of available feature names
-     */
-    public static getLabsFeatures(): string[] {
-        const possibleFeatures = Object.keys(SETTINGS).filter((s) => SettingsStore.isFeature(s));
-
-        const enableLabs = SdkConfig.get()["enableLabs"];
-        if (enableLabs) return possibleFeatures;
-
-        return possibleFeatures.filter((s) => SettingsStore.getFeatureState(s) === "labs");
-    }
-
     /**
      * Determines if a setting is also a feature.
      * @param {string} settingName The setting to look up.
@@ -263,39 +250,6 @@ export default class SettingsStore {
         return SETTINGS[settingName].isFeature;
     }
 
-    /**
-     * Determines if a given feature is enabled. The feature given must be a known
-     * feature.
-     * @param {string} settingName The name of the setting that is a feature.
-     * @param {String} roomId The optional room ID to validate in, may be null.
-     * @return {boolean} True if the feature is enabled, false otherwise
-     */
-    public static isFeatureEnabled(settingName: string, roomId: string = null) {
-        if (!SettingsStore.isFeature(settingName)) {
-            throw new Error("Setting " + settingName + " is not a feature");
-        }
-
-        return SettingsStore.getValue(settingName, roomId);
-    }
-
-    /**
-     * Sets a feature as enabled or disabled on the current device.
-     * @param {string} settingName The name of the setting.
-     * @param {boolean} value True to enable the feature, false otherwise.
-     * @returns {Promise} Resolves when the setting has been set.
-     */
-    public static setFeatureEnabled(settingName: string, value: any): Promise<void> {
-        // Verify that the setting is actually a setting
-        if (!SETTINGS[settingName]) {
-            throw new Error("Setting '" + settingName + "' does not appear to be a setting.");
-        }
-        if (!SettingsStore.isFeature(settingName)) {
-            throw new Error("Setting " + settingName + " is not a feature");
-        }
-
-        return SettingsStore.setValue(settingName, null, SettingLevel.DEVICE, value);
-    }
-
     /**
      * Gets the value of a setting. The room ID is optional if the setting is not to
      * be applied to any particular room, otherwise it should be supplied.
@@ -346,13 +300,6 @@ export default class SettingsStore {
         const minIndex = levelOrder.indexOf(level);
         if (minIndex === -1) throw new Error("Level " + level + " is not prioritized");
 
-        if (SettingsStore.isFeature(settingName)) {
-            const configValue = SettingsStore.getFeatureState(settingName);
-            if (configValue === "enable") return true;
-            if (configValue === "disable") return false;
-            // else let it fall through the default process
-        }
-
         const handlers = SettingsStore.getHandlers(settingName);
 
         // Check if we need to invert the setting at all. Do this after we get the setting
@@ -611,24 +558,6 @@ export default class SettingsStore {
 
         return handlers;
     }
-
-    private static getFeatureState(settingName: string): LabsFeatureState {
-        const featuresConfig = SdkConfig.get()['features'];
-        const enableLabs = SdkConfig.get()['enableLabs']; // we'll honour the old flag
-
-        let featureState = enableLabs ? "labs" : "disable";
-        if (featuresConfig && featuresConfig[settingName] !== undefined) {
-            featureState = featuresConfig[settingName];
-        }
-
-        const allowedStates = ['enable', 'disable', 'labs'];
-        if (!allowedStates.includes(featureState)) {
-            console.warn("Feature state '" + featureState + "' is invalid for " + settingName);
-            featureState = "disable"; // to prevent accidental features.
-        }
-
-        return featureState;
-    }
 }
 
 // For debugging purposes

src/stores/CustomRoomTagStore.js

@@ -137,7 +137,7 @@ class CustomRoomTagStore extends EventEmitter {
     }
 
     _getUpdatedTags() {
-        if (!SettingsStore.isFeatureEnabled("feature_custom_tags")) {
+        if (!SettingsStore.getValue("feature_custom_tags")) {
             return {}; // none
         }
 

src/stores/room-list/RoomListStore.ts

@@ -136,7 +136,7 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
     }
 
     private async readAndCacheSettingsFromStore() {
-        const tagsEnabled = SettingsStore.isFeatureEnabled("feature_custom_tags");
+        const tagsEnabled = SettingsStore.getValue("feature_custom_tags");
         await this.updateState({
             tagsEnabled,
         });

src/stores/room-list/previews/ReactionEventPreview.ts

@@ -24,8 +24,8 @@ import DMRoomMap from "../../../utils/DMRoomMap";
 
 export class ReactionEventPreview implements IPreview {
     public getTextFor(event: MatrixEvent, tagId?: TagID): string {
-        const showDms = SettingsStore.isFeatureEnabled("feature_roomlist_preview_reactions_dms");
+        const showDms = SettingsStore.getValue("feature_roomlist_preview_reactions_dms");
-        const showAll = SettingsStore.isFeatureEnabled("feature_roomlist_preview_reactions_all");
+        const showAll = SettingsStore.getValue("feature_roomlist_preview_reactions_all");
 
         if (!showAll && (!showDms || DMRoomMap.shared().getUserIdForRoomId(event.getRoomId()))) return null;