Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
render message deleted tile for beacons (#8905)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kerry authored Jun 27, 2022
1 parent e7a8dbd commit 5538161
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/utils/beacon/timeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,9 @@ import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
*/
export const shouldDisplayAsBeaconTile = (event: MatrixEvent): boolean => (
M_BEACON_INFO.matches(event.getType()) &&
!!event.getContent()?.live
(
event.getContent()?.live ||
// redacted beacons should show 'message deleted' tile
event.isRedacted()
)
);
6 changes: 6 additions & 0 deletions test/utils/beacon/timeline-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,17 @@ describe('shouldDisplayAsBeaconTile', () => {
const liveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: true });
const notLiveBeacon = makeBeaconInfoEvent(userId, roomId, { isLive: false });
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', () => {
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', () => {
expect(shouldDisplayAsBeaconTile(notLiveBeacon)).toBe(false);
});
Expand Down

0 comments on commit 5538161

Please sign in to comment.