Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split receipt events up into one per room

This commit is contained in:
Erik Johnston 2015-07-08 11:36:05 +01:00
parent 87311d1b8c
commit d85ce8d89b
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
synapse/handlers/receipts.py
View File

@ -144,9 +144,8 @@ class ReceiptsHandler(BaseHandler):
event = { event = {
"type": "m.receipt", "type": "m.receipt",
"content": { "room_id": room_id,
room_id: result, "content": result,
},
} }
defer.returnValue([event]) defer.returnValue([event])
@ -163,23 +162,19 @@ class ReceiptEventSource(object):
rooms = yield self.store.get_rooms_for_user(user.to_string()) rooms = yield self.store.get_rooms_for_user(user.to_string())
rooms = [room.room_id for room in rooms] rooms = [room.room_id for room in rooms]
content = {} events = []
for room_id in rooms: for room_id in rooms:
result = yield self.store.get_linearized_receipts_for_room( content = yield self.store.get_linearized_receipts_for_room(
room_id, from_key, to_key room_id, from_key, to_key
) )
if result: if content:
content[room_id] = result events.append({
if not content:
defer.returnValue(([], to_key))
event = {
"type": "m.receipt", "type": "m.receipt",
"room_id": room_id,
"content": content, "content": content,
} })
defer.returnValue(([event], to_key)) defer.returnValue((events, to_key))
def get_current_key(self, direction='f'): def get_current_key(self, direction='f'):
return self.store.get_max_receipt_stream_id() return self.store.get_max_receipt_stream_id()
@ -195,20 +190,16 @@ class ReceiptEventSource(object):
rooms = yield self.store.get_rooms_for_user(user.to_string()) rooms = yield self.store.get_rooms_for_user(user.to_string())
rooms = [room.room_id for room in rooms] rooms = [room.room_id for room in rooms]
content = {} events = []
for room_id in rooms: for room_id in rooms:
result = yield self.store.get_linearized_receipts_for_room( content = yield self.store.get_linearized_receipts_for_room(
room_id, from_key, to_key room_id, from_key, to_key
) )
if result: if content:
content[room_id] = result events.append({
if not content:
defer.returnValue(([], to_key))
event = {
"type": "m.receipt", "type": "m.receipt",
"room_id": room_id,
"content": content, "content": content,
} })
defer.returnValue(([event], to_key)) defer.returnValue((events, to_key))