Merge pull request #3810 from matrix-org/erikj/send_tags_down_sync_on_join

Send existing room tags down sync on join
This commit is contained in:
Amber Brown 2018-09-07 23:28:42 +10:00 committed by GitHub
commit 9a5ea511b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions

1
changelog.d/3810.bugfix Normal file
View File

@ -0,0 +1 @@
Fix existing room tags not coming down sync when joining a room

View File

@ -1575,6 +1575,19 @@ class SyncHandler(object):
newly_joined_room=newly_joined, newly_joined_room=newly_joined,
) )
# When we join the room (or the client requests full_state), we should
# send down any existing tags. Usually the user won't have tags in a
# newly joined room, unless either a) they've joined before or b) the
# tag was added by synapse e.g. for server notice rooms.
if full_state:
user_id = sync_result_builder.sync_config.user.to_string()
tags = yield self.store.get_tags_for_room(user_id, room_id)
# If there aren't any tags, don't send the empty tags list down
# sync
if not tags:
tags = None
account_data_events = [] account_data_events = []
if tags is not None: if tags is not None:
account_data_events.append({ account_data_events.append({