Fix redaction event list summaries breaking sender profiles
This commit is contained in:
parent
427f649be6
commit
497caf5645
1 changed files with 9 additions and 6 deletions
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue