From b7d42c1e93034da2aa7185f1742c56c7bb45cbcc Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Thu, 18 Sep 2014 15:28:52 +0200 Subject: SYWEB-40: Only local rooms are shown in the recents list. Removed an old patch that deduplicated join events. This patch is now useless. Plus it is buggy since it compared event.content and event.prev_content only on the membership field whereas these objects contain more data now like displayname... --- webclient/components/matrix/event-handler-service.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index d3de10c7e2..321054f904 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -232,13 +232,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) { }; var handleRoomMember = function(event, isLiveEvent, isStateEvent) { - // if the server is stupidly re-relaying a no-op join, discard it. - if (event.prev_content && - event.content.membership === "join" && - event.content.membership === event.prev_content.membership) - { - return; - } // add membership changes as if they were a room message if something interesting changed // Exception: Do not do this if the event is a room state event because such events already come -- cgit 1.4.1