From 0e6a2f87f96124b707994439beb90787e2d578d1 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 15 Aug 2014 17:47:45 +0100
Subject: Get presence for members when you enter a room (it was coming down
 but wasn't being stored in the right place)

---
 webclient/room/room-controller.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 6f1aeccca4..1b921325b3 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -111,6 +111,10 @@ angular.module('RoomController', [])
     var updateMemberList = function(chunk) {
         var isNewMember = !(chunk.target_user_id in $scope.members);
         if (isNewMember) {
+            if ("state" in chunk.content) {
+                chunk.presenceState = chunk.content.state;
+            }
+        
             $scope.members[chunk.target_user_id] = chunk;
             // get their display name and profile picture and set it to their
             // member entry in $scope.members. We HAVE to use $timeout with 0 delay 
-- 
cgit 1.4.1