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

Simplify logic and layout

Browse Source
This commit is contained in:
Daniel Wagner-Hall
2015-10-30 14:58:59 +00:00
parent 83c53f6a79
commit 11f052bcc6
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/models/room.js
View File

@@ -415,6 +415,11 @@ function setEventMetadata(event, stateContext, toStartOfTimeline) {
function calculateRoomName(room, userId) { function calculateRoomName(room, userId) {
// check for an alias, if any. for now, assume first alias is the // check for an alias, if any. for now, assume first alias is the
// official one. // official one.
var mRoomName = room.currentState.getStateEvents('m.room.name', '');
if (mRoomName) {
return mRoomName.getContent().name;
}
var alias; var alias;
var canonicalAlias = room.currentState.getStateEvents("m.room.canonical_alias", ""); var canonicalAlias = room.currentState.getStateEvents("m.room.canonical_alias", "");
if (canonicalAlias) { if (canonicalAlias) {
@@ -427,15 +432,10 @@ function calculateRoomName(room, userId) {
alias = mRoomAliases.getContent().aliases[0]; alias = mRoomAliases.getContent().aliases[0];
} }
} }
if (alias) {
var mRoomName = room.currentState.getStateEvents('m.room.name', '');
if (mRoomName) {
return mRoomName.getContent().name + (false && alias ? " (" + alias + ")" : "");
}
else if (alias) {
return alias; return alias;
} }
else {
// get members that are NOT ourselves and are actually in the room. // get members that are NOT ourselves and are actually in the room.
var members = utils.filter(room.currentState.getMembers(), function(m) { var members = utils.filter(room.currentState.getMembers(), function(m) {
return (m.userId !== userId && m.membership !== "leave"); return (m.userId !== userId && m.membership !== "leave");
@@ -479,7 +479,6 @@ function calculateRoomName(room, userId) {
); );
} }
} }
}
/** /**
* The Room class. * The Room class.