diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index 0f27f7a660..a0db0538f3 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -17,80 +17,133 @@
'use strict';
angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHandlerService'])
-.controller('RecentsController', ['$scope', 'matrixService', 'eventHandlerService',
- function($scope, matrixService, eventHandlerService) {
- $scope.rooms = {};
+.controller('RecentsController', ['$rootScope', '$scope', 'matrixService', 'eventHandlerService',
+ function($rootScope, $scope, matrixService, eventHandlerService) {
+
+ // FIXME: Angularjs reloads the controller (and resets its $scope) each time
+ // the page URL changes, use $rootScope to avoid to have to reload data
+ $rootScope.rooms;
- // $scope of the parent where the recents component is included can override this value
+ // $rootScope of the parent where the recents component is included can override this value
// in order to highlight a specific room in the list
- $scope.recentsSelectedRoomID;
-
+ $rootScope.recentsSelectedRoomID;
+
var listenToEventStream = function() {
// Refresh the list on matrix invitation and message event
- $scope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
+ $rootScope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
+ if (isLive) {
+ if (!$rootScope.rooms[event.room_id]) {
+ // The user has joined a new room, which we do not have data yet. The reason is that
+ // the room has appeared in the scope of the user rooms after the global initialSync
+ // FIXME: an initialSync on this specific room should be done
+ $rootScope.rooms[event.room_id] = {
+ room_id:event.room_id
+ };
+ }
+ else if (event.state_key === matrixService.config().user_id && "invite" !== event.membership && "join" !== event.membership) {
+ // The user has been kicked or banned from the room, remove this room from the recents
+ delete $rootScope.rooms[event.room_id];
+ }
+
+ if ($rootScope.rooms[event.room_id]) {
+ $rootScope.rooms[event.room_id].lastMsg = event;
+ }
+
+ // Update room users count
+ $rootScope.rooms[event.room_id].numUsersInRoom = getUsersCountInRoom(event.room_id);
+ }
+ });
+ $rootScope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) {
+ if (isLive) {
+ $rootScope.rooms[event.room_id].lastMsg = event;
+ }
+ });
+ $rootScope.$on(eventHandlerService.CALL_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
- $scope.rooms[event.room_id].lastMsg = event;
+ $rootScope.rooms[event.room_id].lastMsg = event;
}
});
- $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) {
+ $rootScope.$on(eventHandlerService.ROOM_CREATE_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
- $scope.rooms[event.room_id].lastMsg = event;
+ $rootScope.rooms[event.room_id] = event;
}
});
- $scope.$on(eventHandlerService.CALL_EVENT, function(ngEvent, event, isLive) {
+ $rootScope.$on(eventHandlerService.NAME_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
- $scope.rooms[event.room_id].lastMsg = event;
+ $rootScope.rooms[event.room_id].lastMsg = event;
}
});
- $scope.$on(eventHandlerService.ROOM_CREATE_EVENT, function(ngEvent, event, isLive) {
+ $rootScope.$on(eventHandlerService.TOPIC_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
- $scope.rooms[event.room_id] = event;
+ $rootScope.rooms[event.room_id].lastMsg = event;
}
});
};
-
- var refresh = function() {
- // List all rooms joined or been invited to
- // TODO: This is a pity that event-stream-service.js makes the same call
- // We should be able to reuse event-stream-service.js fetched data
- matrixService.rooms(1, false).then(
- function(response) {
- // Reset data
- $scope.rooms = {};
+ /**
+ * Compute the room users number, ie the number of members who has joined the room.
+ * @param {String} room_id the room id
+ * @returns {undefined | Number} the room users number if available
+ */
+ var getUsersCountInRoom = function(room_id) {
+ var memberCount;
+
+ var room = $rootScope.events.rooms[room_id];
+ if (room) {
+ memberCount = 0;
+
+ for (var i in room.members) {
+ var member = room.members[i];
+
+ if ("join" === member.membership) {
+ memberCount = memberCount + 1;
+ }
+ }
+ }
+
+ return memberCount;
+ };
- var rooms = response.data.rooms;
+ $scope.onInit = function() {
+ // Init recents list only once
+ if ($rootScope.rooms) {
+ return;
+ }
+
+ $rootScope.rooms = {};
+
+ // Use initialSync data to init the recents list
+ eventHandlerService.waitForInitialSyncCompletion().then(
+ function(initialSyncData) {
+
+ var rooms = initialSyncData.data.rooms;
for (var i=0; i<rooms.length; i++) {
var room = rooms[i];
// Add room_alias & room_display_name members
- $scope.rooms[room.room_id] = angular.extend(room, matrixService.getRoomAliasAndDisplayName(room));
+ $rootScope.rooms[room.room_id] = angular.extend(room, matrixService.getRoomAliasAndDisplayName(room));
// Create a shortcut for the last message of this room
if (room.messages && room.messages.chunk && room.messages.chunk[0]) {
- $scope.rooms[room.room_id].lastMsg = room.messages.chunk[0];
+ $rootScope.rooms[room.room_id].lastMsg = room.messages.chunk[0];
}
- }
-
- var presence = response.data.presence;
- for (var i = 0; i < presence.length; ++i) {
- eventHandlerService.handleEvent(presence[i], false);
+
+ $rootScope.rooms[room.room_id].numUsersInRoom = getUsersCountInRoom(room.room_id);
}
// From now, update recents from the stream
listenToEventStream();
},
function(error) {
- $scope.feedback = "Failure: " + error.data;
+ $rootScope.feedback = "Failure: " + error.data;
}
);
};
- $scope.onInit = function() {
- eventHandlerService.waitForInitialSyncCompletion().then(function() {
- refresh();
- });
- };
-
+ // Clean data when user logs out
+ $scope.$on(eventHandlerService.RESET_EVENT, function() {
+
+ delete $rootScope.rooms;
+ });
}]);
|
