summary refs log tree commit diff
path: root/webclient
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-17 16:38:32 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-17 16:38:40 +0100
commitaeaeceb92c648bf99bce60eb1bc77fcc81020d53 (patch)
treec350747a5ac10806ad1fb7eec9314aa8e710f0b3 /webclient
parentwebclient SYWEB-3 : Public rooms are bold. Can't think of a nicer way which d... (diff)
downloadsynapse-aeaeceb92c648bf99bce60eb1bc77fcc81020d53.tar.xz
Create room entries for public rooms too so their public state is transferred over correctly when you join it.
Diffstat (limited to '')
-rw-r--r--webclient/components/matrix/event-handler-service.js1
-rw-r--r--webclient/home/home-controller.js2
2 files changed, 3 insertions, 0 deletions
diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js
index 0be294d745..d3de10c7e2 100644
--- a/webclient/components/matrix/event-handler-service.js
+++ b/webclient/components/matrix/event-handler-service.js
@@ -517,6 +517,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
             if (!visible) {
                 return;
             }
+            initRoom(room_id);
             
             var room = $rootScope.events.rooms[room_id];
             if (room) {
diff --git a/webclient/home/home-controller.js b/webclient/home/home-controller.js
index 8ba817ca68..e35219bebb 100644
--- a/webclient/home/home-controller.js
+++ b/webclient/home/home-controller.js
@@ -53,6 +53,8 @@ angular.module('HomeController', ['matrixService', 'eventHandlerService', 'Recen
 
                     // Add room_alias & room_display_name members
                     angular.extend(room, matrixService.getRoomAliasAndDisplayName(room));
+                    
+                    eventHandlerService.setRoomVisibility(room.room_id, "public");
                 }
             }
         );