Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:36:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improved requests: pagination is done from the data received in initialSync

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-09-10 12:01:00 +02:00
parent 2bd4346075
commit b63dd9506e
3 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
webclient/components/matrix/event-handler-service.js
View file

@ -55,6 +55,11 @@ angular.module('eventHandlerService', [])
$rootScope.events.rooms[room_id] = {};
$rootScope.events.rooms[room_id].messages = [];
$rootScope.events.rooms[room_id].members = {};
// Pagination information
$rootScope.events.rooms[room_id].pagination = {
earliest_token: "END" // how far back we've paginated
}
}
};
@ -187,17 +192,21 @@ angular.module('eventHandlerService', [])
NAME_EVENT: NAME_EVENT,
handleEvent: function(event, isLiveEvent) {
// FIXME: event duplication suppression is all broken as the code currently expect to handles
// events multiple times to get their side-effects...
/*
// Avoid duplicated events
// Needed for rooms where initialSync has not been done.
// In this case, we do not know where to start pagination. So, it starts from the END
// and we can have the same event (ex: joined, invitation) coming from the pagination
// AND from the event stream.
// FIXME: This workaround should be no more required when /initialSync on a particular room
// will be available (as opposite to the global /initialSync done at startup)
if (eventMap[event.event_id]) {
console.log("discarding duplicate event: " + JSON.stringify(event));
console.log("discarding duplicate event: " + JSON.stringify(event, undefined, 4));
return;
}
else {
eventMap[event.event_id] = 1;
}
*/
if (event.type.indexOf('m.call.') === 0) {
handleCallEvent(event, isLiveEvent);
}
@ -247,6 +256,15 @@ angular.module('eventHandlerService', [])
}
},
// Handle messages from /initialSync or /messages
handleRoomMessages: function(room_id, messages, isLiveEvents) {
this.handleEvents(messages.chunk);
// Store how far back we've paginated
// This assumes the paginations requests are contiguous and in reverse chronological order
$rootScope.events.rooms[room_id].pagination.earliest_token = messages.end;
},
handleInitialSyncDone: function(initialSyncData) {
console.log("# handleInitialSyncDone");
initialSyncDeferred.resolve(initialSyncData);

9
webclient/components/matrix/event-stream-service.js
View file

@ -112,9 +112,16 @@ angular.module('eventStreamService', [])
var rooms = response.data.rooms;
for (var i = 0; i < rooms.length; ++i) {
var room = rooms[i];
// console.log("got room: " + room.room_id);
if ("state" in room) {
eventHandlerService.handleEvents(room.state, false);
//eventHandlerService.handleEvents(room.state, false);
}
if ("messages" in room) {
eventHandlerService.handleRoomMessages(room.room_id, room.messages, false);
console.log(room.messages.start + " - " + room.messages.end);
}
}