OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

render message deleted tile for beacons (#8905)

pull/28217/head
Kerry 2022-06-27 14:21:22 +02:00 committed by GitHub
parent e7a8dbd04c
commit 5538161acd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/beacon/timeline.ts
View File

@ -23,5 +23,9 @@ import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
*/ */
export const shouldDisplayAsBeaconTile = (event: MatrixEvent): boolean => ( export const shouldDisplayAsBeaconTile = (event: MatrixEvent): boolean => (
M_BEACON_INFO.matches(event.getType()) && M_BEACON_INFO.matches(event.getType()) &&
!!event.getContent()?.live (
event.getContent()?.live ||
// redacted beacons should show 'message deleted' tile
event.isRedacted()
)
); );

6
test/utils/beacon/timeline-test.ts
View File

@ -25,11 +25,17 @@ describe('shouldDisplayAsBeaconTile', () => {
const liveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: true }); const liveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: true });
const notLiveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: false }); const notLiveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: false });
const memberEvent = new MatrixEvent({ type: EventType.RoomMember }); const memberEvent = new MatrixEvent({ type: EventType.RoomMember });
const redactedBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: false });
redactedBeacon.makeRedacted(redactedBeacon);
it('returns true for a beacon with live property set to true', () => { it('returns true for a beacon with live property set to true', () => {
expect(shouldDisplayAsBeaconTile(liveBeacon)).toBe(true); expect(shouldDisplayAsBeaconTile(liveBeacon)).toBe(true);
}); });
it('returns true for a redacted beacon', () => {
expect(shouldDisplayAsBeaconTile(redactedBeacon)).toBe(true);
});
it('returns false for a beacon with live property set to false', () => { it('returns false for a beacon with live property set to false', () => {
expect(shouldDisplayAsBeaconTile(notLiveBeacon)).toBe(false); expect(shouldDisplayAsBeaconTile(notLiveBeacon)).toBe(false);
}); });