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

Merge branch 'develop' into rav/flatten_sync_response

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2015-11-19 17:21:03 +00:00
commit dd11bf8a79
17 changed files with 163 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/rest/client/v2_alpha/sync.py
View file

@ -274,8 +274,8 @@ class SyncRestServlet(RestServlet):
serialized_state = [serialize(e) for e in state_events]
serialized_timeline = [serialize(e) for e in timeline_events]
private_user_data = filter.filter_room_private_user_data(
room.private_user_data
account_data = filter.filter_room_account_data(
room.account_data
)
result = {
@ -285,7 +285,7 @@ class SyncRestServlet(RestServlet):
"limited": room.timeline.limited,
},
"state": {"events": serialized_state},
"private_user_data": {"events": private_user_data},
"account_data": {"events": account_data},
}
if joined:

4
synapse/rest/client/v2_alpha/tags.py
View file

@ -81,7 +81,7 @@ class TagServlet(RestServlet):
max_id = yield self.store.add_tag_to_room(user_id, room_id, tag, body)
yield self.notifier.on_new_event(
"private_user_data_key", max_id, users=[user_id]
"account_data_key", max_id, users=[user_id]
)
defer.returnValue((200, {}))
@ -95,7 +95,7 @@ class TagServlet(RestServlet):
max_id = yield self.store.remove_tag_from_room(user_id, room_id, tag)
yield self.notifier.on_new_event(
"private_user_data_key", max_id, users=[user_id]
"account_data_key", max_id, users=[user_id]
)
defer.returnValue((200, {}))