Prevent unnecessary m.direct updates (#9805)
* Prevent unnecessary m.direct updates Signed-off-by: Michael Weimann <michaelw@matrix.org> * Replace object with Map * Clean up comment; simplify code * Fix rte flaky test (#9811) * Snap in PiP widget when content changed (#9797) * Check modified at the end of setDMRoom * Revert "Snap in PiP widget when content changed (#9797)" This reverts commit be1e5753677bdf84b3657994dc5ad20d250038bd. * Revert "Fix rte flaky test (#9811)" This reverts commit 20d9eb3924c5ebc63f03cb61b172035725e3474d. * Update src/Rooms.ts Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Signed-off-by: Michael Weimann <michaelw@matrix.org> Co-authored-by: Florian Duros <florianduros@element.io> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
This commit is contained in:
parent
dd88fbbc3b
commit
93dd010809
2 changed files with 167 additions and 11 deletions
151
test/Rooms-test.ts
Normal file
151
test/Rooms-test.ts
Normal file
|
@ -0,0 +1,151 @@
|
|||
/*
|
||||
Copyright 2022 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
import { mocked } from "jest-mock";
|
||||
import { EventType, MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import { setDMRoom } from "../src/Rooms";
|
||||
import { mkEvent, stubClient } from "./test-utils";
|
||||
|
||||
describe("setDMRoom", () => {
|
||||
const userId1 = "@user1:example.com";
|
||||
const userId2 = "@user2:example.com";
|
||||
const userId3 = "@user3:example.com";
|
||||
const roomId1 = "!room1:example.com";
|
||||
const roomId2 = "!room2:example.com";
|
||||
const roomId3 = "!room3:example.com";
|
||||
const roomId4 = "!room4:example.com";
|
||||
let client: MatrixClient;
|
||||
|
||||
beforeEach(() => {
|
||||
client = mocked(stubClient());
|
||||
client.getAccountData = jest.fn().mockImplementation((eventType: string): MatrixEvent | undefined => {
|
||||
if (eventType === EventType.Direct) {
|
||||
return mkEvent({
|
||||
event: true,
|
||||
content: {
|
||||
[userId1]: [roomId1, roomId2],
|
||||
[userId2]: [roomId3],
|
||||
},
|
||||
type: EventType.Direct,
|
||||
user: client.getSafeUserId(),
|
||||
});
|
||||
}
|
||||
|
||||
return undefined;
|
||||
});
|
||||
});
|
||||
|
||||
describe("when logged in as a guest and marking a room as DM", () => {
|
||||
beforeEach(() => {
|
||||
mocked(client.isGuest).mockReturnValue(true);
|
||||
setDMRoom(roomId1, userId1);
|
||||
});
|
||||
|
||||
it("should not update the account data", () => {
|
||||
expect(client.setAccountData).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("when adding a new room to an existing DM relation", () => {
|
||||
beforeEach(() => {
|
||||
setDMRoom(roomId4, userId1);
|
||||
});
|
||||
|
||||
it("should update the account data accordingly", () => {
|
||||
expect(client.setAccountData).toHaveBeenCalledWith(EventType.Direct, {
|
||||
[userId1]: [roomId1, roomId2, roomId4],
|
||||
[userId2]: [roomId3],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("when adding a new DM room", () => {
|
||||
beforeEach(() => {
|
||||
setDMRoom(roomId4, userId3);
|
||||
});
|
||||
|
||||
it("should update the account data accordingly", () => {
|
||||
expect(client.setAccountData).toHaveBeenCalledWith(EventType.Direct, {
|
||||
[userId1]: [roomId1, roomId2],
|
||||
[userId2]: [roomId3],
|
||||
[userId3]: [roomId4],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("when trying to add a DM, that already exists", () => {
|
||||
beforeEach(() => {
|
||||
setDMRoom(roomId1, userId1);
|
||||
});
|
||||
|
||||
it("should not update the account data", () => {
|
||||
expect(client.setAccountData).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("when removing an existing DM", () => {
|
||||
beforeEach(() => {
|
||||
setDMRoom(roomId1, null);
|
||||
});
|
||||
|
||||
it("should update the account data accordingly", () => {
|
||||
expect(client.setAccountData).toHaveBeenCalledWith(EventType.Direct, {
|
||||
[userId1]: [roomId2],
|
||||
[userId2]: [roomId3],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("when removing an unknown room", () => {
|
||||
beforeEach(() => {
|
||||
setDMRoom(roomId4, null);
|
||||
});
|
||||
|
||||
it("should not update the account data", () => {
|
||||
expect(client.setAccountData).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("when the direct event is undefined", () => {
|
||||
beforeEach(() => {
|
||||
mocked(client.getAccountData).mockReturnValue(undefined);
|
||||
setDMRoom(roomId1, userId1);
|
||||
});
|
||||
|
||||
it("should update the account data accordingly", () => {
|
||||
expect(client.setAccountData).toHaveBeenCalledWith(EventType.Direct, {
|
||||
[userId1]: [roomId1],
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("when the current content is undefined", () => {
|
||||
beforeEach(() => {
|
||||
// @ts-ignore
|
||||
mocked(client.getAccountData).mockReturnValue({
|
||||
getContent: jest.fn(),
|
||||
});
|
||||
setDMRoom(roomId1, userId1);
|
||||
});
|
||||
|
||||
it("should update the account data accordingly", () => {
|
||||
expect(client.setAccountData).toHaveBeenCalledWith(EventType.Direct, {
|
||||
[userId1]: [roomId1],
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
Loading…
Add table
Add a link
Reference in a new issue