From 11f052bcc6f5e0ad0ca6782c0c74ab19c1c186df Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Fri, 30 Oct 2015 14:58:59 +0000
Subject: [PATCH] Simplify logic and layout

---
 lib/models/room.js | 77 +++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/lib/models/room.js b/lib/models/room.js
index da4d1f1b6..4dccd6454 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -415,6 +415,11 @@ function setEventMetadata(event, stateContext, toStartOfTimeline) {
 function calculateRoomName(room, userId) {
     // check for an alias, if any. for now, assume first alias is the
     // official one.
+    var mRoomName = room.currentState.getStateEvents('m.room.name', '');
+    if (mRoomName) {
+        return mRoomName.getContent().name;
+    }
+
     var alias;
     var canonicalAlias = room.currentState.getStateEvents("m.room.canonical_alias", "");
     if (canonicalAlias) {
@@ -427,58 +432,52 @@ function calculateRoomName(room, userId) {
             alias = mRoomAliases.getContent().aliases[0];
         }
     }
-
-    var mRoomName = room.currentState.getStateEvents('m.room.name', '');
-    if (mRoomName) {
-        return mRoomName.getContent().name + (false && alias ? " (" + alias + ")" : "");
-    }
-    else if (alias) {
+    if (alias) {
         return alias;
     }
-    else {
-        // get members that are NOT ourselves and are actually in the room.
-        var members = utils.filter(room.currentState.getMembers(), function(m) {
-            return (m.userId !== userId && m.membership !== "leave");
+
+    // get members that are NOT ourselves and are actually in the room.
+    var members = utils.filter(room.currentState.getMembers(), function(m) {
+        return (m.userId !== userId && m.membership !== "leave");
+    });
+    // TODO: Localisation
+    if (members.length === 0) {
+        var memberList = utils.filter(room.currentState.getMembers(), function(m) {
+            return (m.membership !== "leave");
         });
-        // TODO: Localisation
-        if (members.length === 0) {
-            var memberList = utils.filter(room.currentState.getMembers(), function(m) {
-                return (m.membership !== "leave");
-            });
-            if (memberList.length === 1) {
-                // we exist, but no one else... self-chat or invite.
-                if (memberList[0].membership === "invite") {
-                    if (memberList[0].events.member) {
-                        // extract who invited us to the room
-                        return "Invite from " + memberList[0].events.member.getSender();
-                    }
-                    else {
-                        return "Room Invite";
-                    }
+        if (memberList.length === 1) {
+            // we exist, but no one else... self-chat or invite.
+            if (memberList[0].membership === "invite") {
+                if (memberList[0].events.member) {
+                    // extract who invited us to the room
+                    return "Invite from " + memberList[0].events.member.getSender();
                 }
                 else {
-                    return userId;
+                    return "Room Invite";
                 }
             }
             else {
-                // there really isn't anyone in this room...
-                return "?";
+                return userId;
             }
         }
-        else if (members.length === 1) {
-            return members[0].name;
-        }
-        else if (members.length === 2) {
-            return (
-                members[0].name + " and " + members[1].name
-            );
-        }
         else {
-            return (
-                members[0].name + " and " + (members.length - 1) + " others"
-            );
+            // there really isn't anyone in this room...
+            return "?";
         }
     }
+    else if (members.length === 1) {
+        return members[0].name;
+    }
+    else if (members.length === 2) {
+        return (
+            members[0].name + " and " + members[1].name
+        );
+    }
+    else {
+        return (
+            members[0].name + " and " + (members.length - 1) + " others"
+        );
+    }
 }
 
 /**