mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 06:41:57 +00:00
more timestamp fixes
This commit is contained in:
parent
514e0fd4b6
commit
e9abbe89f3
@ -148,10 +148,10 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) {
|
||||
// ts is later.
|
||||
var latestData = true;
|
||||
if (!isLiveEvent) {
|
||||
var eventTs = event.ts;
|
||||
var eventTs = event.origin_server_ts;
|
||||
var storedEvent = $rootScope.events.rooms[event.room_id][event.type];
|
||||
if (storedEvent) {
|
||||
if (storedEvent.ts > eventTs) {
|
||||
if (storedEvent.origin_server_ts > eventTs) {
|
||||
// ignore it, we have a newer one already.
|
||||
latestData = false;
|
||||
}
|
||||
|
@ -59,9 +59,9 @@ angular.module('RecentsController')
|
||||
return 1;
|
||||
}
|
||||
else {
|
||||
return lastMsgRoomB.ts - lastMsgRoomA.ts;
|
||||
return lastMsgRoomB.origin_server_ts - lastMsgRoomA.origin_server_ts;
|
||||
}
|
||||
});
|
||||
return filtered;
|
||||
};
|
||||
}]);
|
||||
}]);
|
||||
|
@ -18,7 +18,7 @@
|
||||
Declaring it in this way ensures the data-binding -->
|
||||
{{ lastMsg = eventHandlerService.getLastMessage(room.room_id, true);"" }}
|
||||
|
||||
{{ (lastMsg.ts) | date:'MMM d HH:mm' }}
|
||||
{{ (lastMsg.origin_server_ts) | date:'MMM d HH:mm' }}
|
||||
|
||||
<img ng-click="leave(room.room_id); $event.stopPropagation();" src="img/close.png" width="10" height="10" style="margin-bottom: -1px; margin-left: 2px;" alt="close"/>
|
||||
</td>
|
||||
|
Loading…
Reference in New Issue
Block a user