imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change OOO so that MELS generation will continue over hidden events

Browse source 
this fixes the scenario of N Member events, then an invisible event
e.g. (m.room.aliases) then more Member events. Pre hide-join-parts
this is how it worked.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2017-08-16 13:20:32 +01:00
parent b5f959cbdc
commit 14903274c0
No known key found for this signature in database
GPG key ID: 0435A1D4BBD34D64
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -339,6 +339,11 @@ module.exports = React.createClass({
for (;i + 1 < this.props.events.length; i++) { for (;i + 1 < this.props.events.length; i++) {
const collapsedMxEv = this.props.events[i + 1]; const collapsedMxEv = this.props.events[i + 1];
// Ignore redacted/hidden member events
if (!this._shouldShowEvent(collapsedMxEv)) {
continue;
}
if (!isMembershipChange(collapsedMxEv) || if (!isMembershipChange(collapsedMxEv) ||
this._wantsDateSeparator(this.props.events[i], collapsedMxEv.getDate())) { this._wantsDateSeparator(this.props.events[i], collapsedMxEv.getDate())) {
break; break;
@ -349,11 +354,6 @@ module.exports = React.createClass({
readMarkerInMels = true; readMarkerInMels = true;
} }
// Ignore redacted/hidden member events
if (!this._shouldShowEvent(collapsedMxEv)) {
continue;
}
summarisedEvents.push(collapsedMxEv); summarisedEvents.push(collapsedMxEv);
} }