Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-07-07 19:52:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2354 from krombel/reduce_static_sync_reply

Browse Source 
encode sync-response statically
This commit is contained in:
Erik Johnston 2017-07-11 14:19:56 +01:00 committed by GitHub
commit 0184a97dbd
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
synapse/rest/client/v2_alpha/sync.py
View File

@ -164,27 +164,34 @@ class SyncRestServlet(RestServlet):
) )
time_now = self.clock.time_msec() time_now = self.clock.time_msec()
response_content = self.encode_response(
joined = self.encode_joined( time_now, sync_result, requester.access_token_id, filter
sync_result.joined, time_now, requester.access_token_id, filter.event_fields
) )
invited = self.encode_invited( defer.returnValue((200, response_content))
sync_result.invited, time_now, requester.access_token_id
@staticmethod
def encode_response(time_now, sync_result, access_token_id, filter):
joined = SyncRestServlet.encode_joined(
sync_result.joined, time_now, access_token_id, filter.event_fields
) )
archived = self.encode_archived( invited = SyncRestServlet.encode_invited(
sync_result.archived, time_now, requester.access_token_id, sync_result.invited, time_now, access_token_id,
)
archived = SyncRestServlet.encode_archived(
sync_result.archived, time_now, access_token_id,
filter.event_fields, filter.event_fields,
) )
response_content = { return {
"account_data": {"events": sync_result.account_data}, "account_data": {"events": sync_result.account_data},
"to_device": {"events": sync_result.to_device}, "to_device": {"events": sync_result.to_device},
"device_lists": { "device_lists": {
"changed": list(sync_result.device_lists), "changed": list(sync_result.device_lists),
}, },
"presence": self.encode_presence( "presence": SyncRestServlet.encode_presence(
sync_result.presence, time_now sync_result.presence, time_now
), ),
"rooms": { "rooms": {
@ -196,9 +203,8 @@ class SyncRestServlet(RestServlet):
"next_batch": sync_result.next_batch.to_string(), "next_batch": sync_result.next_batch.to_string(),
} }
defer.returnValue((200, response_content)) @staticmethod
def encode_presence(events, time_now):
def encode_presence(self, events, time_now):
return { return {
"events": [ "events": [
{ {
@ -212,7 +218,8 @@ class SyncRestServlet(RestServlet):
] ]
} }
def encode_joined(self, rooms, time_now, token_id, event_fields): @staticmethod
def encode_joined(rooms, time_now, token_id, event_fields):
""" """
Encode the joined rooms in a sync result Encode the joined rooms in a sync result
@ -231,13 +238,14 @@ class SyncRestServlet(RestServlet):
""" """
joined = {} joined = {}
for room in rooms: for room in rooms:
joined[room.room_id] = self.encode_room( joined[room.room_id] = SyncRestServlet.encode_room(
room, time_now, token_id, only_fields=event_fields room, time_now, token_id, only_fields=event_fields
) )
return joined return joined
def encode_invited(self, rooms, time_now, token_id): @staticmethod
def encode_invited(rooms, time_now, token_id):
""" """
Encode the invited rooms in a sync result Encode the invited rooms in a sync result
@ -270,7 +278,8 @@ class SyncRestServlet(RestServlet):
return invited return invited
def encode_archived(self, rooms, time_now, token_id, event_fields): @staticmethod
def encode_archived(rooms, time_now, token_id, event_fields):
""" """
Encode the archived rooms in a sync result Encode the archived rooms in a sync result
@ -289,7 +298,7 @@ class SyncRestServlet(RestServlet):
""" """
joined = {} joined = {}
for room in rooms: for room in rooms:
joined[room.room_id] = self.encode_room( joined[room.room_id] = SyncRestServlet.encode_room(
room, time_now, token_id, joined=False, only_fields=event_fields room, time_now, token_id, joined=False, only_fields=event_fields
) )