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

only clobber displayname & avatarurl from presence if set. fixes https://github.com/vector-im/vector-web/issues/1039. again.

Browse Source
This commit is contained in:
Matthew Hodgson
2016-06-01 03:45:16 +01:00
parent fb388f5d2d
commit 7243367a64
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/models/user.js
View File

@@ -85,8 +85,12 @@ User.prototype.setPresenceEvent = function(event) {
} }
this.presence = event.getContent().presence; this.presence = event.getContent().presence;
this.displayName = event.getContent().displayname; if (event.getContent().displayname) {
this.avatarUrl = event.getContent().avatar_url; this.displayName = event.getContent().displayname;
}
if (event.getContent().avatarUrl) {
this.avatarUrl = event.getContent().avatar_url;
}
this.lastActiveAgo = event.getContent().last_active_ago; this.lastActiveAgo = event.getContent().last_active_ago;
this.lastPresenceTs = Date.now(); this.lastPresenceTs = Date.now();
this.currentlyActive = event.getContent().currently_active; this.currentlyActive = event.getContent().currently_active;