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

Merge pull request #560 from matrix-org/luke/fix-join-part-collapsing-regressions2

Browse source 
Fix more membership change collapsing bugs
This commit is contained in:
Richard van der Hoff 2016-11-16 16:33:18 +00:00 • committed by GitHub
commit f3582edb99
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/views/elements/MemberEventListSummary.js
View file

@ -156,16 +156,21 @@ module.exports = React.createClass({
let senders = new Set(eventsToRender.map((e) => e.getSender())); let senders = new Set(eventsToRender.map((e) => e.getSender()));
senders.forEach( senders.forEach(
(userId) => { (userId) => {
// Only push the last event if it isn't the same membership as the first
let userEvents = eventsToRender.filter((e) => { let userEvents = eventsToRender.filter((e) => {
return e.getSender() === userId; return e.getSender() === userId;
}); });
// NB: These may be the same event, in which case the lastEvent is used
// because prev_content should != content
let firstEvent = userEvents[0]; let firstEvent = userEvents[0];
let lastEvent = userEvents[userEvents.length - 1]; let lastEvent = userEvents[userEvents.length - 1];
if (firstEvent.getContent().membership !== lastEvent.getContent().membership) { // Membership BEFORE eventsToRender
let previousMembership = firstEvent.getPrevContent().membership || "leave";
// Otherwise, if the last membership event differs from previousMembership,
// use that.
if (previousMembership !== lastEvent.getContent().membership) {
filteredEvents.push(lastEvent); filteredEvents.push(lastEvent);
} }
} }