imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1

Browse source 
 Conflicts:
	src/stores/room-list/RoomListStore.ts
This commit is contained in:
Michael Telatynski 2021-05-07 10:40:07 +01:00
commit 6137162786
50 changed files with 928 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/stores/room-list/RoomListStore.ts
View file

@ -426,6 +426,10 @@ export class RoomListStoreClass extends AsyncStoreWithClient<IState> {
return; // don't do anything on rooms that aren't visible
}
if (cause === RoomUpdateCause.NewRoom && !this.prefilterConditions.every(c => c.isVisible(room))) {
return; // don't do anything on new rooms which ought not to be shown
}
const shouldUpdate = await this.algorithm.handleRoomUpdate(room, cause);
if (shouldUpdate) {
if (SettingsStore.getValue("advancedRoomListLogging")) {