matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

Set the right .sender value for m.room.member events

Browse Source
This commit is contained in:
Kegan Dougal
2016-03-16 17:18:33 +00:00
parent 60b6310494
commit d0560f594d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/models/event-timeline.js
View File

@@ -227,7 +227,12 @@ EventTimeline.prototype.addEvent = function(event, atStart, spliceBeforeLocalEch
// it again if the prop wasn't previously set. It may also mean that // it again if the prop wasn't previously set. It may also mean that
// the sender/target is updated (if the event set was a room member event) // the sender/target is updated (if the event set was a room member event)
// so we want to use the *updated* member (new avatar/name) instead. // so we want to use the *updated* member (new avatar/name) instead.
if (!event.sender || event.getType() === "m.room.member") { //
// However, we do NOT want to do this on member events if we're going
// back in time, else we'll set the .sender value for BEFORE the given
// member event, whereas we want to set the .sender value for the ACTUAL
// member event itself.
if (!event.sender || (event.getType() === "m.room.member" && !atStart)) {
setEventMetadata(event, stateContext, atStart); setEventMetadata(event, stateContext, atStart);
} }
} }

4
spec/integ/matrix-client-room-timeline.spec.js
View File

@@ -288,7 +288,7 @@ describe("MatrixClient room timelines", function() {
oldMshipEvent, oldMshipEvent,
utils.mkMessage({ utils.mkMessage({
user: userId, room: roomId, msg: "I'm old alice" user: userId, room: roomId, msg: "I'm old alice"
}), }),
joinMshipEvent, joinMshipEvent,
]; ];
@@ -300,7 +300,7 @@ describe("MatrixClient room timelines", function() {
client.scrollback(room).done(function() { client.scrollback(room).done(function() {
expect(room.timeline.length).toEqual(5); expect(room.timeline.length).toEqual(5);
var joinMsg = room.timeline[0]; var joinMsg = room.timeline[0];
expect(joinMsg.sender.name).toEqual("Old Alice"); expect(joinMsg.sender.name).toEqual("Old Alice");
var oldMsg = room.timeline[1]; var oldMsg = room.timeline[1];
expect(oldMsg.sender.name).toEqual("Old Alice"); expect(oldMsg.sender.name).toEqual("Old Alice");