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

fix https://github.com/vector-im/vector-web/issues/1039, for

Browse Source 
literally the 4th time. unbreak tests, and fix camelcase hell.
This commit is contained in:
Matthew Hodgson
2016-06-02 16:54:18 +01:00
parent 09d08a5092
commit 11f02d2e24
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/models/user.js
View File

@@ -77,10 +77,14 @@ User.prototype.setPresenceEvent = function(event) {
if (event.getContent().presence !== this.presence || firstFire) { if (event.getContent().presence !== this.presence || firstFire) {
eventsToFire.push("User.presence"); eventsToFire.push("User.presence");
} }
if (event.getContent().avatar_url !== this.avatarUrl) { if (event.getContent().avatar_url &&
event.getContent().avatar_url !== this.avatarUrl)
{
eventsToFire.push("User.avatarUrl"); eventsToFire.push("User.avatarUrl");
} }
if (event.getContent().displayname !== this.displayName) { if (event.getContent().displayname &&
event.getContent().displayname !== this.displayName)
{
eventsToFire.push("User.displayName"); eventsToFire.push("User.displayName");
} }
@@ -88,7 +92,7 @@ User.prototype.setPresenceEvent = function(event) {
if (event.getContent().displayname) { if (event.getContent().displayname) {
this.displayName = event.getContent().displayname; this.displayName = event.getContent().displayname;
} }
if (event.getContent().avatarUrl) { if (event.getContent().avatar_url) {
this.avatarUrl = event.getContent().avatar_url; this.avatarUrl = event.getContent().avatar_url;
} }
this.lastActiveAgo = event.getContent().last_active_ago; this.lastActiveAgo = event.getContent().last_active_ago;