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

Commit

Permalink
Prevent sliding sync from showing a room under multiple sublists (#9266)
Browse files Browse the repository at this point in the history
* Prevent sliding sync from showing a room under multiple sublists

* Add tests

(cherry picked from commit 96656e4)
  • Loading branch information
t3chguy authored Sep 12, 2022
1 parent 28a418d commit 6be85e7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
12 changes: 12 additions & 0 deletions cypress/e2e/sliding-sync/sliding-sync.ts
Original file line number Diff line number Diff line change
Expand Up @@ -319,4 +319,16 @@ describe("Sliding Sync", () => {
"Join", "Test Room",
]);
});

it("should show a favourite DM only in the favourite sublist", () => {
cy.createRoom({
name: "Favourite DM",
is_direct: true,
}).as("room").then(roomId => {
cy.getClient().then(cli => cli.setRoomTag(roomId, "m.favourite", { order: 0.5 }));
});

cy.get('.mx_RoomSublist[aria-label="Favourites"]').contains(".mx_RoomTile", "Favourite DM").should("exist");
cy.get('.mx_RoomSublist[aria-label="People"]').contains(".mx_RoomTile", "Favourite DM").should("not.exist");
});
});
4 changes: 4 additions & 0 deletions src/stores/room-list/SlidingRoomListStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ const filterConditions: Record<TagID, MSC3575Filter> = {
is_dm: true,
is_invite: false,
is_tombstoned: false,
// If a DM has a Favourite & Low Prio tag then it'll be shown in those lists instead
not_tags: ["m.favourite", "m.lowpriority"],
},
[DefaultTagID.Untagged]: {
is_dm: false,
Expand All @@ -66,6 +68,8 @@ const filterConditions: Record<TagID, MSC3575Filter> = {
},
[DefaultTagID.LowPriority]: {
tags: ["m.lowpriority"],
// If a room has both Favourite & Low Prio tags then it'll be shown under Favourites
not_tags: ["m.favourite"],
is_tombstoned: false,
},
// TODO https://github.com/vector-im/element-web/issues/23207
Expand Down

0 comments on commit 6be85e7

Please sign in to comment.