OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix more join-part collapsing regressions 

Use the previous content of the first event known for a user in a block of membership changes. This means single events are not special cased.
pull/21833/head
Luke Barnard 2016-11-16 16:26:24 +00:00
parent 324448563a
commit 7e88f0083d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/views/elements/MemberEventListSummary.js
View File

@ -156,21 +156,21 @@ module.exports = React.createClass({
let senders = new Set(eventsToRender.map((e) => e.getSender()));
senders.forEach(
(userId) => {
// Only push the last event if it isn't the same membership as the first
let userEvents = eventsToRender.filter((e) => {
return e.getSender() === userId;
});
if (userEvents.length === 1) {
filteredEvents.push(userEvents[0]);
return;
}
// NB: These may be the same event, in which case the lastEvent is used
// because prev_content should != content
let firstEvent = userEvents[0];
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);
}
}