From 746ed57c0e5a2d49388c99ba1a51fca0bc207096 Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Tue, 9 Sep 2014 16:31:50 +0200 Subject: When the user has been kicked or banned from a room, remove the room from his recents list --- webclient/recents/recents-controller.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js index 9fe369828b..0553eb9be0 100644 --- a/webclient/recents/recents-controller.js +++ b/webclient/recents/recents-controller.js @@ -51,7 +51,14 @@ angular.module('RecentsController', ['matrixService', 'matrixFilter', 'eventHand room_id:event.room_id }; } - $rootScope.rooms[event.room_id].lastMsg = event; + 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; + } } }); $rootScope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) { -- cgit 1.4.1