mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix redaction event list summaries breaking sender profiles

Browse source
This commit is contained in:
Michael Telatynski 2021-03-22 13:22:16 +00:00
parent 427f649be6
commit 497caf5645
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/structures/MessagePanel.js
View file

@ -1044,6 +1044,10 @@ class RedactionGrouper {
} }
shouldGroup(ev) { shouldGroup(ev) {
// absorb hidden events so that they do not break up streams of messages & redaction events being grouped
if (!this.panel._shouldShowEvent(ev)) {
return true;
}
if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) { if (this.panel._wantsDateSeparator(this.events[0], ev.getDate())) {
return false; return false;
} }
@ -1055,6 +1059,9 @@ class RedactionGrouper {
ev.getId(), ev.getId(),
ev === this.lastShownEvent, ev === this.lastShownEvent,
); );
if (!this.panel._shouldShowEvent(ev)) {
return;
}
this.events.push(ev); this.events.push(ev);
} }
@ -1080,13 +1087,9 @@ class RedactionGrouper {
); );
const senders = new Set(); const senders = new Set();
let eventTiles = this.events.map((e) => { let eventTiles = this.events.map((e, i) => {
senders.add(e.sender); senders.add(e.sender);
// In order to prevent DateSeparators from appearing in the expanded form, return panel._getTilesForEvent(i === 0 ? this.prevEvent : this.events[i - 1], e, e === lastShownEvent);
// render each member event as if the previous one was itself.
// This way, the timestamp of the previous event === the
// timestamp of the current event, and no DateSeparator is inserted.
return panel._getTilesForEvent(e, e, e === lastShownEvent);
}).reduce((a, b) => a.concat(b), []); }).reduce((a, b) => a.concat(b), []);
if (eventTiles.length === 0) { if (eventTiles.length === 0) {