diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js
index 45a671e631..a0db0538f3 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -27,12 +27,30 @@ angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHand
// $rootScope of the parent where the recents component is included can override this value
// in order to highlight a specific room in the list
$rootScope.recentsSelectedRoomID;
-
+
var listenToEventStream = function() {
// Refresh the list on matrix invitation and message event
$rootScope.$on(eventHandlerService.MEMBER_EVENT, function(ngEvent, event, isLive) {
if (isLive) {
- $rootScope.rooms[event.room_id].lastMsg = event;
+ 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) {
@@ -50,15 +68,48 @@ angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHand
$rootScope.rooms[event.room_id] = event;
}
});
+ $rootScope.$on(eventHandlerService.NAME_EVENT, function(ngEvent, event, isLive) {
+ if (isLive) {
+ $rootScope.rooms[event.room_id].lastMsg = event;
+ }
+ });
+ $rootScope.$on(eventHandlerService.TOPIC_EVENT, function(ngEvent, event, isLive) {
+ if (isLive) {
+ $rootScope.rooms[event.room_id].lastMsg = event;
+ }
+ });
};
+ /**
+ * 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;
+ };
$scope.onInit = function() {
// Init recents list only once
if ($rootScope.rooms) {
return;
}
-
+
$rootScope.rooms = {};
// Use initialSync data to init the recents list
@@ -76,11 +127,8 @@ angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHand
if (room.messages && room.messages.chunk && room.messages.chunk[0]) {
$rootScope.rooms[room.room_id].lastMsg = room.messages.chunk[0];
}
- }
-
- var presence = initialSyncData.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
@@ -91,6 +139,11 @@ angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHand
}
);
};
-
+
+ // Clean data when user logs out
+ $scope.$on(eventHandlerService.RESET_EVENT, function() {
+
+ delete $rootScope.rooms;
+ });
}]);
|
