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

Disable bubbles for broadcasts (#9860)

pull/28217/head
Michael Weimann 2023-01-05 12:33:28 +01:00 committed by GitHub
parent 2a4a7eacff
commit f34c1609c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/EventRenderingUtils.ts
View File

@ -94,7 +94,8 @@ export function getEventDisplayInfo(
(eventType === EventType.RoomMessage && msgtype === MsgType.Emote) || (eventType === EventType.RoomMessage && msgtype === MsgType.Emote) ||
M_POLL_START.matches(eventType) || M_POLL_START.matches(eventType) ||
M_BEACON_INFO.matches(eventType) || M_BEACON_INFO.matches(eventType) ||
isLocationEvent(mxEvent); isLocationEvent(mxEvent) ||
eventType === VoiceBroadcastInfoEventType;
// If we're showing hidden events in the timeline, we should use the // If we're showing hidden events in the timeline, we should use the
// source tile when there's no regular tile for an event and also for // source tile when there's no regular tile for an event and also for

4
test/utils/EventRenderingUtils-test.ts
View File

@ -32,7 +32,7 @@ describe("getEventDisplayInfo", () => {
"isInfoMessage": false, "isInfoMessage": false,
"isLeftAlignedBubbleMessage": false, "isLeftAlignedBubbleMessage": false,
"isSeeingThroughMessageHiddenForModeration": false, "isSeeingThroughMessageHiddenForModeration": false,
"noBubbleEvent": false, "noBubbleEvent": true,
} }
`); `);
}); });
@ -46,7 +46,7 @@ describe("getEventDisplayInfo", () => {
"isInfoMessage": true, "isInfoMessage": true,
"isLeftAlignedBubbleMessage": false, "isLeftAlignedBubbleMessage": false,
"isSeeingThroughMessageHiddenForModeration": false, "isSeeingThroughMessageHiddenForModeration": false,
"noBubbleEvent": false, "noBubbleEvent": true,
} }
`); `);
}); });