@@ -175,8 +175,8 @@ def active():

                     data = get_event()

                     ev = ServerSentEvent(id, "active", data).encode()

                     yield ev

-                    time.sleep(0.1)

                     t0 = t1

+                time.sleep(0.1)

         except GeneratorExit:

             print 'GeneratorExit!'

     response = flask.Response(stream_with_context(poll()), mimetype="text/event-stream")

@@ -267,9 +267,10 @@ marrowApp.controller('UserSettingCtrl', function ($scope,$http,$location) {

 marrowApp.controller('SidebarCtrl', function ($scope,$http,$location,$route, $window, UserService) {

   eventSource = new EventSource("/api/user/active");

   $scope.activeUsers = Object.create(null);

+  $scope.activeUsers.users = []

   eventSource.addEventListener("active", function(event) {

-    console.log(event);

-    $scope.activeUsers.users = JSON.parse(event.data).data;

+    var users = $scope.activeUsers.users;

+    Array.prototype.splice.apply(users, [0, users.length].concat(JSON.parse(event.data).data));

   });

   $scope.subscriptions = function() {