matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-09 08:42:50 +03:00
Code Activity

LLS: Remove beacon info illegal replace relation (#8390)

Browse Source 
* dont apply illegal replace relation to beacon_info event

Signed-off-by: Kerry Archibald <kerrya@element.io>

* only display tiles for beacon infos with live prop

Signed-off-by: Kerry Archibald <kerrya@element.io>

* copyrights

Signed-off-by: Kerry Archibald <kerrya@element.io>
This commit is contained in:
Kerry
2022-04-22 13:38:27 +02:00
committed by GitHub
parent 763edb7ab9
commit a3a7c60dd7
5 changed files with 72 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/stores/OwnBeaconStore-test.ts
View File

@@ -20,7 +20,6 @@ import {
BeaconEvent,
getBeaconInfoIdentifier,
MatrixEvent,
RelationType,
RoomStateEvent,
RoomMember,
} from "matrix-js-sdk/src/matrix";
@@ -473,14 +472,6 @@ describe('OwnBeaconStore', () => {
const expectedUpdateContent = {
...prevEventContent,
live: false,
["m.new_content"]: {
...prevEventContent,
live: false,
},
["m.relates_to"]: {
event_id: alicesRoom1BeaconInfo.getId(),
rel_type: RelationType.Replace,
},
};
expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalledWith(
room1Id,
@@ -650,14 +641,6 @@ describe('OwnBeaconStore', () => {
const expectedUpdateContent = {
...prevEventContent,
live: false,
["m.new_content"]: {
...prevEventContent,
live: false,
},
["m.relates_to"]: {
event_id: alicesRoom1BeaconInfo.getId(),
rel_type: RelationType.Replace,
},
};
expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalledWith(
room1Id,
@@ -683,14 +666,6 @@ describe('OwnBeaconStore', () => {
const expectedUpdateContent = {
...prevEventContent,
live: false,
["m.new_content"]: {
...prevEventContent,
live: false,
},
["m.relates_to"]: {
event_id: alicesRoom1BeaconInfo.getId(),
rel_type: RelationType.Replace,
},
};
expect(mockClient.unstable_setLiveBeacon).toHaveBeenCalledWith(
room1Id,

40
test/utils/beacon/timeline-test.ts Normal file
View File

@@ -0,0 +1,40 @@
/*
Copyright 2020 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 { EventType, MatrixEvent } from "matrix-js-sdk/src/matrix";
import { shouldDisplayAsBeaconTile } from "../../../src/utils/beacon/timeline";
import { makeBeaconInfoEvent } from "../../test-utils";
describe('shouldDisplayAsBeaconTile', () => {
const userId = '@user:server';
const roomId = '!room:server';
const liveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: true });
const notLiveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: false });
const memberEvent = new MatrixEvent({ type: EventType.RoomMember });
it('returns true for a beacon with live property set to true', () => {
expect(shouldDisplayAsBeaconTile(liveBeacon)).toBe(true);
});
it('returns false for a beacon with live property set to false', () => {
expect(shouldDisplayAsBeaconTile(notLiveBeacon)).toBe(false);
});
it('returns false for a non beacon event', () => {
expect(shouldDisplayAsBeaconTile(memberEvent)).toBe(false);
});
});