mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-12-01 23:41:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix room list handling of membership changes (#31197)

Browse Source 
* Fix room list handling of membership changes

Including knock->invite for ask to join

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* lint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2025-11-10 12:40:39 +00:00 committed by GitHub
parent 39a5cca737
commit f6e85a38d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stores/room-list-v3/RoomListStoreV3.ts
View File

@ -260,7 +260,7 @@ export class RoomListStoreV3Class extends AsyncStoreWithClient<EmptyObject> {
} }
} }
this.addRoomAndEmit(payload.room, true); this.addRoomAndEmit(payload.room, oldMembership === EffectiveMembership.Leave);
break; break;
} }

32
test/unit-tests/stores/room-list-v3/RoomListStoreV3-test.ts
View File

@ -29,6 +29,7 @@ import SettingsStore from "../../../../src/settings/SettingsStore";
import * as utils from "../../../../src/utils/notifications"; import * as utils from "../../../../src/utils/notifications";
import * as roomMute from "../../../../src/stores/room-list/utils/roomMute"; import * as roomMute from "../../../../src/stores/room-list/utils/roomMute";
import { Action } from "../../../../src/dispatcher/actions"; import { Action } from "../../../../src/dispatcher/actions";
import { SettingLevel } from "../../../../src/settings/SettingLevel.ts";
describe("RoomListStoreV3", () => { describe("RoomListStoreV3", () => {
async function getRoomListStore() { async function getRoomListStore() {
@ -218,7 +219,6 @@ describe("RoomListStoreV3", () => {
dispatcher.dispatch( dispatcher.dispatch(
{ {
action: "MatrixActions.Room.myMembership", action: "MatrixActions.Room.myMembership",
oldMembership: KnownMembership.Invite,
membership: KnownMembership.Join, membership: KnownMembership.Join,
room: newRoom, room: newRoom,
}, },
@ -253,7 +253,6 @@ describe("RoomListStoreV3", () => {
dispatcher.dispatch( dispatcher.dispatch(
{ {
action: "MatrixActions.Room.myMembership", action: "MatrixActions.Room.myMembership",
oldMembership: KnownMembership.Invite,
membership: KnownMembership.Join, membership: KnownMembership.Join,
room: newRoom, room: newRoom,
}, },
@ -759,6 +758,35 @@ describe("RoomListStoreV3", () => {
expect(result).toHaveLength(1); expect(result).toHaveLength(1);
expect(result).toContain(rooms[8]); expect(result).toContain(rooms[8]);
}); });
it("should update filters on membership change", async () => {
await SettingsStore.setValue("feature_ask_to_join", null, SettingLevel.DEVICE, true);
const { store, client, dispatcher } = await getRoomListStore();
const room = new Room("!fooknock:matrix.org", client, client.getSafeUserId(), {});
room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Knock);
dispatcher.dispatch(
{
action: "MatrixActions.Room.myMembership",
membership: KnownMembership.Knock,
room,
},
true,
);
expect(store.getSortedRoomsInActiveSpace([FilterKey.InvitesFilter]).rooms).not.toContain(room);
room.getMyMembership = jest.fn().mockReturnValue(KnownMembership.Invite);
dispatcher.dispatch(
{
action: "MatrixActions.Room.myMembership",
oldMembership: KnownMembership.Knock,
membership: KnownMembership.Invite,
room,
},
true,
);
expect(store.getSortedRoomsInActiveSpace([FilterKey.InvitesFilter]).rooms).toContain(room);
});
}); });
}); });