diff options
| author | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:03:33 -0400 |
|---|---|---|
| committer | Patrick Cloke <patrickc@matrix.org> | 2020-04-23 12:03:33 -0400 |
| commit | 204664d1adf95f26a14ff5b6a4635cbac75b044a (patch) | |
| tree | 2a9eb605318b29d6346c558e99a5a24dce2289d3 /synapse/handlers/sync.py | |
| parent | Revert "Merge pull request #7315 from matrix-org/babolivier/request_token" (diff) | |
| parent | 1.12.4 (diff) | |
| download | synapse-204664d1adf95f26a14ff5b6a4635cbac75b044a.tar.xz | |
Merge tag 'v1.12.4'
Synapse v1.12.4 Features: * Always send users their own device updates. (#7160) * Add support for handling GET requests for account_data on a worker. (#7311) Bugfixes: * Fix a bug that prevented cross-signing with users on worker-mode synapses. (#7255) * Do not treat display names as globs in push rules. (#7271) * Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. (#7289)
Diffstat (limited to 'synapse/handlers/sync.py')
| -rw-r--r-- | synapse/handlers/sync.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py index 669dbc8a48..cfd5dfc9e5 100644 --- a/synapse/handlers/sync.py +++ b/synapse/handlers/sync.py @@ -1143,9 +1143,14 @@ class SyncHandler(object): user_id ) + tracked_users = set(users_who_share_room) + + # Always tell the user about their own devices + tracked_users.add(user_id) + # Step 1a, check for changes in devices of users we share a room with users_that_have_changed = await self.store.get_users_whose_devices_changed( - since_token.device_list_key, users_who_share_room + since_token.device_list_key, tracked_users ) # Step 1b, check for newly joined rooms |