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

Make recents[controller/filter/html] use modelService.

Browse source 
This breaks functionality whilst both events.rooms and modelService
are in use.
This commit is contained in:
Kegan Dougal 2014-11-03 11:44:39 +00:00
parent 53da1099d1
commit 6bc1dc4020
5 changed files with 66 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,18 +86,6 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService
}
$rootScope.events.rooms[room_id].membership = room.membership;
}
// =========================================
var __room = modelService.getRoom(room_id);
if (room) { // /initialSync data
__room.current_room_state.storeStateEvents(room.state);
__room.current_room_state.pagination_token = room.messages.end;
__room.old_room_state.storeStateEvents(room.state);
__room.old_room_state.pagination_token = room.messages.start;
$rootScope["debug_"+room_id] = __room;
}
};
var resetRoomMessages = function(room_id) {
@ -621,12 +609,44 @@ function(matrixService, $rootScope, $q, $timeout, mPresence, notificationService
var room = rooms[i];
this.initRoom(room);
// FIXME: This is ming: the HS should be sending down the m.room.member
// event for the invite in .state but it isn't, so fudge it for now.
if (room.inviter && room.membership === "invite") {
var me = matrixService.config().user_id;
var fakeEvent = {
event_id: "__FAKE__" + room.room_id,
user_id: room.inviter,
origin_server_ts: 0,
room_id: room.room_id,
state_key: me,
type: "m.room.member",
content: {
membership: "invite"
}
};
if (!room.state) {
room.state = [];
}
room.state.push(fakeEvent);
console.log("RECV /initialSync invite >> "+JSON.stringify(fakeEvent));
}
// =========================================
var __room = modelService.getRoom(room.room_id);
__room.current_room_state.storeStateEvents(room.state);
__room.old_room_state.storeStateEvents(room.state);
if ("messages" in room) {
this.handleRoomMessages(room.room_id, room.messages, false);
__room.current_room_state.pagination_token = room.messages.end;
__room.old_room_state.pagination_token = room.messages.start;
}
if ("state" in room) {
if ("state" in room) { // TODO FIXME remove this.
this.handleEvents(room.state, false, true);
}
}