From 7dac1bfc9148e4e23d388d8281aacee2bb41d5db Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 21 Aug 2014 17:17:41 +0100
Subject: Change webclient to always hit the im sync api before streaming so we
 get current presence state

---
 webclient/rooms/rooms-controller.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'webclient/rooms')

diff --git a/webclient/rooms/rooms-controller.js b/webclient/rooms/rooms-controller.js
index f2ff4a25ba..6bbb2b2ba1 100644
--- a/webclient/rooms/rooms-controller.js
+++ b/webclient/rooms/rooms-controller.js
@@ -93,11 +93,16 @@ angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload',
         // List all rooms joined or been invited to
         matrixService.rooms().then(
             function(response) {
-                var data = assignRoomAliases(response.data);
+                var data = assignRoomAliases(response.data.rooms);
                 $scope.feedback = "Success";
                 for (var i=0; i<data.length; i++) {
                     $scope.rooms[data[i].room_id] = data[i];
                 }
+
+                var presence = response.data.presence;
+                for (var i = 0; i < presence.length; ++i) {
+                    eventHandlerService.handleEvent(presence[i], false);
+                }
             },
             function(error) {
                 $scope.feedback = "Failure: " + error.data;
-- 
cgit 1.5.1