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

Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/fix/20721

Browse source
This commit is contained in:
Michael Telatynski 2024-11-27 14:53:20 +00:00
commit 1bee3becfb
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
69 changed files with 1357 additions and 599 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/unit-tests/stores/MemberListStore-test.ts
View file

@ -201,6 +201,7 @@ describe("MemberListStore", () => {
function addEventToRoom(room: Room, ev: MatrixEvent) {
room.getLiveTimeline().addEvent(ev, {
toStartOfTimeline: false,
addToState: true,
});
}

2
test/unit-tests/stores/RoomViewStore-test.ts
View file

@ -397,7 +397,7 @@ describe("RoomViewStore", function () {
mockClient.getSafeUserId(),
"ABC123",
);
room2.addLiveEvents([broadcastEvent]);
room2.addLiveEvents([broadcastEvent], { addToState: true });
stores.voiceBroadcastPlaybacksStore.getByInfoEvent(broadcastEvent, mockClient);
dis.dispatch({ action: Action.ViewRoom, room_id: roomId2 });

2
test/unit-tests/stores/room-list/MessagePreviewStore-test.ts
View file

@ -35,7 +35,7 @@ describe("MessagePreviewStore", () => {
event: MatrixEvent,
fireAction = true,
): Promise<void> {
room.addLiveEvents([event]);
room.addLiveEvents([event], { addToState: true });
if (fireAction) {
// @ts-ignore private access
await store.onAction({

18
test/unit-tests/stores/room-list/algorithms/RecentAlgorithm-test.ts
View file

@ -47,11 +47,11 @@ describe("RecentAlgorithm", () => {
room.getMyMembership = () => KnownMembership.Join;
room.addLiveEvents([event1]);
room.addLiveEvents([event1], { addToState: true });
expect(algorithm.getLastTs(room, "@jane:matrix.org")).toBe(5);
expect(algorithm.getLastTs(room, "@john:matrix.org")).toBe(5);
room.addLiveEvents([event2]);
room.addLiveEvents([event2], { addToState: true });
expect(algorithm.getLastTs(room, "@jane:matrix.org")).toBe(10);
expect(algorithm.getLastTs(room, "@john:matrix.org")).toBe(10);
@ -94,8 +94,8 @@ describe("RecentAlgorithm", () => {
event: true,
});
room1.addLiveEvents([evt]);
room2.addLiveEvents([evt2]);
room1.addLiveEvents([evt], { addToState: true });
room2.addLiveEvents([evt2], { addToState: true });
expect(algorithm.sortRooms([room2, room1], DefaultTagID.Untagged)).toEqual([room1, room2]);
});
@ -115,7 +115,7 @@ describe("RecentAlgorithm", () => {
event: true,
});
room1.addLiveEvents([evt]);
room1.addLiveEvents([evt], { addToState: true });
expect(algorithm.sortRooms([room2, room1], DefaultTagID.Untagged)).toEqual([room2, room1]);
@ -127,7 +127,7 @@ describe("RecentAlgorithm", () => {
ts: 12,
});
room1.addLiveEvents(events);
room1.addLiveEvents(events, { addToState: true });
});
it("orders rooms based on thread replies too", () => {
@ -145,7 +145,7 @@ describe("RecentAlgorithm", () => {
ts: 12,
length: 5,
});
room1.addLiveEvents(events1);
room1.addLiveEvents(events1, { addToState: true });
const { events: events2 } = mkThread({
room: room2,
@ -155,7 +155,7 @@ describe("RecentAlgorithm", () => {
ts: 14,
length: 10,
});
room2.addLiveEvents(events2);
room2.addLiveEvents(events2, { addToState: true });
expect(algorithm.sortRooms([room1, room2], DefaultTagID.Untagged)).toEqual([room2, room1]);
@ -169,7 +169,7 @@ describe("RecentAlgorithm", () => {
// replies are 1ms after each other
ts: 50,
});
room1.addLiveEvents([threadReply]);
room1.addLiveEvents([threadReply], { addToState: true });
expect(algorithm.sortRooms([room1, room2], DefaultTagID.Untagged)).toEqual([room1, room2]);
});

4
test/unit-tests/stores/room-list/previews/ReactionEventPreview-test.ts
View file

@ -70,7 +70,7 @@ describe("ReactionEventPreview", () => {
room: roomId,
});
room.getUnfilteredTimelineSet().addLiveEvent(message, {});
room.getUnfilteredTimelineSet().addLiveEvent(message, { addToState: true });
const event = mkEvent({
event: true,
@ -107,7 +107,7 @@ describe("ReactionEventPreview", () => {
room: roomId,
});
room.getUnfilteredTimelineSet().addLiveEvent(message, {});
room.getUnfilteredTimelineSet().addLiveEvent(message, { addToState: true });
const event = mkEvent({
event: true,