From f64cc237fc819116e78888fb1c542b1c8c08651a Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 8 Sep 2014 17:27:51 -0700 Subject: Fixed bug which displayed an older room topic because it was being returned from /initialSync messages key. Check the ts of the event before clobbering state. --- webclient/components/matrix/event-handler-service.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index a14e515999..8232e3b4b0 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -150,10 +150,22 @@ angular.module('eventHandlerService', []) }; var handleRoomTopic = function(event, isLiveEvent) { - console.log("handleRoomTopic " + isLiveEvent); + console.log("handleRoomTopic live="+isLiveEvent); initRoom(event.room_id); + // live events always update, but non-live events only update if the + // ts is later. + if (!isLiveEvent) { + var eventTs = event.ts; + var storedEvent = $rootScope.events.rooms[event.room_id][event.type]; + if (storedEvent) { + if (storedEvent.ts > eventTs) { + // ignore it, we have a newer one already. + return; + } + } + } $rootScope.events.rooms[event.room_id][event.type] = event; }; -- cgit 1.4.1