matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-09-01 21:21:58 +03:00
Code Activity

fix more NPEs

Browse Source
This commit is contained in:
Matthew Hodgson
2015-07-16 01:37:39 +01:00
parent ee4d0fb9ee
commit 260d9abced
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/client.js
View File

@@ -725,7 +725,7 @@ MatrixClient.prototype.setAvatarUrl = function(url, callback) {
*/ */
MatrixClient.prototype.getAvatarUrlForMember = MatrixClient.prototype.getAvatarUrlForMember =
function(member, width, height, resizeMethod) { function(member, width, height, resizeMethod) {
if (!member.events.member) { if (!member || !member.events.member) {
return null; return null;
} }
var rawUrl = member.events.member.getContent().avatar_url; var rawUrl = member.events.member.getContent().avatar_url;
@@ -747,6 +747,10 @@ MatrixClient.prototype.getAvatarUrlForMember =
MatrixClient.prototype.getAvatarUrlForRoom = MatrixClient.prototype.getAvatarUrlForRoom =
function(room, width, height, resizeMethod) { function(room, width, height, resizeMethod) {
if (!room || !room.currentState || !room.currentState.members) {
return null;
}
var userId = this.credentials.userId; var userId = this.credentials.userId;
var members = utils.filter(room.currentState.getMembers(), function(m) { var members = utils.filter(room.currentState.getMembers(), function(m) {
return (m.membership === "join" && m.userId !== userId); return (m.membership === "join" && m.userId !== userId);