Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 853d33a

Browse files
committed
Make groups a fully-fleged baked-in feature
1 parent b68b60c commit 853d33a

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

src/UserSettingsStore.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ import SdkConfig from './SdkConfig';
2626
*/
2727

2828
const FEATURES = [
29-
{
30-
id: 'feature_groups',
31-
name: _td("Communities"),
32-
},
3329
{
3430
id: 'feature_pinning',
3531
name: _td("Message Pinning"),

src/components/views/elements/Flair.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ export default class Flair extends React.Component {
8383

8484
componentWillMount() {
8585
this._unmounted = false;
86-
if (UserSettingsStore.isFeatureEnabled('feature_groups') && FlairStore.groupSupport()) {
87-
this._generateAvatars();
88-
}
86+
this._generateAvatars();
8987
this.context.matrixClient.on('RoomState.events', this.onRoomStateEvents);
9088
}
9189

src/components/views/rooms/RoomSettings.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -671,13 +671,11 @@ module.exports = React.createClass({
671671

672672
const self = this;
673673

674-
let relatedGroupsSection;
675-
if (UserSettingsStore.isFeatureEnabled('feature_groups')) {
676-
relatedGroupsSection = <RelatedGroupSettings ref="related_groups"
677-
roomId={this.props.room.roomId}
678-
canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
679-
relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')} />;
680-
}
674+
const relatedGroupsSection = <RelatedGroupSettings ref="related_groups"
675+
roomId={this.props.room.roomId}
676+
canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
677+
relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')}
678+
/>;
681679

682680
let userLevelsSection;
683681
if (Object.keys(user_levels).length) {

0 commit comments

Comments
 (0)