matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Fix edge case with redaction grouper messing up continuations

Browse Source
This commit is contained in:
Michael Telatynski
2021-03-25 19:37:55 +00:00
parent da7d31aeb6
commit 5e3a7c48f4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/MessagePanel.js
View File

@ -46,6 +46,9 @@ function shouldFormContinuation(prevEvent, mxEvent) {
// check if within the max continuation period // check if within the max continuation period
if (mxEvent.getTs() - prevEvent.getTs() > CONTINUATION_MAX_INTERVAL) return false; if (mxEvent.getTs() - prevEvent.getTs() > CONTINUATION_MAX_INTERVAL) return false;
// As we summarise redactions, do not continue a redacted event onto a non-redacted one and vice-versa
if (mxEvent.isRedacted() !== prevEvent.isRedacted()) return false;
// Some events should appear as continuations from previous events of different types. // Some events should appear as continuations from previous events of different types.
if (mxEvent.getType() !== prevEvent.getType() && if (mxEvent.getType() !== prevEvent.getType() &&
(!continuedTypes.includes(mxEvent.getType()) || (!continuedTypes.includes(mxEvent.getType()) ||
@ -1125,7 +1128,7 @@ class RedactionGrouper {
} }
getNewPrevEvent() { getNewPrevEvent() {
return this.events[0]; return this.events[this.events.length - 1];
} }
} }