OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6244 from matrix-org/t3chguy/fix/17368 

Hide communities invites and the community autocompleter when Spaces on
pull/21833/head
Michael Telatynski 2021-06-22 22:50:28 +01:00 committed by GitHub
parent bbdc28f56d 24b03366a8
commit 2a3b92f7d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/autocomplete/Autocompleter.ts
View File

@ -55,13 +55,14 @@ const PROVIDERS = [
EmojiProvider, EmojiProvider,
NotifProvider, NotifProvider,
CommandProvider, CommandProvider,
CommunityProvider,
DuckDuckGoProvider, DuckDuckGoProvider,
]; ];
// as the spaces feature is device configurable only, and toggling it refreshes the page, we can do this here // as the spaces feature is device configurable only, and toggling it refreshes the page, we can do this here
if (SettingsStore.getValue("feature_spaces")) { if (SettingsStore.getValue("feature_spaces")) {
PROVIDERS.push(SpaceProvider); PROVIDERS.push(SpaceProvider);
} else {
PROVIDERS.push(CommunityProvider);
} }
// Providers will get rejected if they take longer than this. // Providers will get rejected if they take longer than this.

1
src/components/views/rooms/RoomList.tsx
View File

@ -466,6 +466,7 @@ export default class RoomList extends React.PureComponent<IProps, IState> {
} }
private renderCommunityInvites(): ReactComponentElement<typeof ExtraTile>[] { private renderCommunityInvites(): ReactComponentElement<typeof ExtraTile>[] {
if (SettingsStore.getValue("feature_spaces")) return [];
// TODO: Put community invites in a more sensible place (not in the room list) // TODO: Put community invites in a more sensible place (not in the room list)
// See https://github.com/vector-im/element-web/issues/14456 // See https://github.com/vector-im/element-web/issues/14456
return MatrixClientPeg.get().getGroups().filter(g => { return MatrixClientPeg.get().getGroups().filter(g => {