From 4abbf575beffc0bd41aec3f3217674f16a6af50a Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Mon, 20 Jun 2016 10:39:40 +0200
Subject: [PATCH] Include user status in "Joined" event. Previously, each user
 broadcasted the status after a "Room" event was received. This caused a short
 time for all other participants where the buddy list showed "Participant X"
 instead of the real user name.

---
 go/channelling/session.go             | 1 +
 static/js/controllers/uicontroller.js | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/go/channelling/session.go b/go/channelling/session.go
index 1dbd77fc..e7032290 100644
--- a/go/channelling/session.go
+++ b/go/channelling/session.go
@@ -154,6 +154,7 @@ func (s *Session) JoinRoom(roomName, roomType string, credentials *DataRoomCrede
 				Userid: s.userid,
 				Ua:     s.Ua,
 				Prio:   s.Prio,
+				Status: s.Status,
 			},
 		})
 	} else {
diff --git a/static/js/controllers/uicontroller.js b/static/js/controllers/uicontroller.js
index 40e70774..f2f482ac 100644
--- a/static/js/controllers/uicontroller.js
+++ b/static/js/controllers/uicontroller.js
@@ -588,10 +588,6 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web
 			}
 		};
 
-		$scope.$on("room.joined", function(ev) {
-			$scope.updateStatus(true);
-		});
-
 		mediaStream.connector.e.on("open error close", function(event) {
 			$timeout.cancel(ttlTimeout);
 			$scope.userid = $scope.suserid = null;