From 853d33a93a75cd9d8775e2b39b4462e44c33e950 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Fri, 10 Nov 2017 15:42:11 +0000
Subject: [PATCH] Make groups a fully-fleged baked-in feature

---
 src/UserSettingsStore.js                   |  4 ----
 src/components/views/elements/Flair.js     |  4 +---
 src/components/views/rooms/RoomSettings.js | 12 +++++-------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index ce39939bc0..34f9a28d57 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -26,10 +26,6 @@ import SdkConfig from './SdkConfig';
  */
 
 const FEATURES = [
-    {
-        id: 'feature_groups',
-        name: _td("Communities"),
-    },
     {
         id: 'feature_pinning',
         name: _td("Message Pinning"),
diff --git a/src/components/views/elements/Flair.js b/src/components/views/elements/Flair.js
index 17d37d593c..ec0276ab55 100644
--- a/src/components/views/elements/Flair.js
+++ b/src/components/views/elements/Flair.js
@@ -83,9 +83,7 @@ export default class Flair extends React.Component {
 
     componentWillMount() {
         this._unmounted = false;
-        if (UserSettingsStore.isFeatureEnabled('feature_groups') && FlairStore.groupSupport()) {
-            this._generateAvatars();
-        }
+        this._generateAvatars();
         this.context.matrixClient.on('RoomState.events', this.onRoomStateEvents);
     }
 
diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 2f46a9308e..c7e839ab40 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -671,13 +671,11 @@ module.exports = React.createClass({
 
         const self = this;
 
-        let relatedGroupsSection;
-        if (UserSettingsStore.isFeatureEnabled('feature_groups')) {
-            relatedGroupsSection = <RelatedGroupSettings ref="related_groups"
-                roomId={this.props.room.roomId}
-                canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
-                relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')} />;
-        }
+        const relatedGroupsSection = <RelatedGroupSettings ref="related_groups"
+            roomId={this.props.room.roomId}
+            canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
+            relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')}
+        />;
 
         let userLevelsSection;
         if (Object.keys(user_levels).length) {