Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make groups a fully-fleged baked-in feature

Browse Source
This commit is contained in:
Luke Barnard 2017-11-10 15:42:11 +00:00
parent b68b60c04c
commit 853d33a93a
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/UserSettingsStore.js
View File

@ -26,10 +26,6 @@ import SdkConfig from './SdkConfig';
*/ */
const FEATURES = [ const FEATURES = [
{
id: 'feature_groups',
name: _td("Communities"),
},
{ {
id: 'feature_pinning', id: 'feature_pinning',
name: _td("Message Pinning"), name: _td("Message Pinning"),

2
src/components/views/elements/Flair.js
View File

@ -83,9 +83,7 @@ export default class Flair extends React.Component {
componentWillMount() { componentWillMount() {
this._unmounted = false; this._unmounted = false;
if (UserSettingsStore.isFeatureEnabled('feature_groups') && FlairStore.groupSupport()) {
this._generateAvatars(); this._generateAvatars();
}
this.context.matrixClient.on('RoomState.events', this.onRoomStateEvents); this.context.matrixClient.on('RoomState.events', this.onRoomStateEvents);
} }

8
src/components/views/rooms/RoomSettings.js
View File

@ -671,13 +671,11 @@ module.exports = React.createClass({
const self = this; const self = this;
let relatedGroupsSection; const relatedGroupsSection = <RelatedGroupSettings ref="related_groups"
if (UserSettingsStore.isFeatureEnabled('feature_groups')) {
relatedGroupsSection = <RelatedGroupSettings ref="related_groups"
roomId={this.props.room.roomId} roomId={this.props.room.roomId}
canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)} canSetRelatedGroups={roomState.mayClientSendStateEvent("m.room.related_groups", cli)}
relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')} />; relatedGroupsEvent={this.props.room.currentState.getStateEvents('m.room.related_groups', '')}
} />;
let userLevelsSection; let userLevelsSection;
if (Object.keys(user_levels).length) { if (Object.keys(user_levels).length) {