summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2020-03-27 12:26:47 +0000
committerDavid Baker <dave@matrix.org>2020-03-27 12:26:47 +0000
commit09cc058a4c3eae58ee6e08c1925bffd9cf7d52c6 (patch)
tree38c7916c0b46605fab9a7de06011f72ca68477ff /synapse/handlers/sync.py
parentMerge pull request #7151 from matrix-org/jaywink/saml-redirect-fix (diff)
downloadsynapse-09cc058a4c3eae58ee6e08c1925bffd9cf7d52c6.tar.xz
Always send the user updates to their own device list
This will allow clients to notify users about new devices even if
the user isn't in any rooms (yet).
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r--synapse/handlers/sync.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index 5746fdea14..fd68a31b09 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -1139,13 +1139,14 @@ class SyncHandler(object):
             # room with by looking at all users that have left a room plus users
             # that were in a room we've left.
 
-            users_who_share_room = await self.store.get_users_who_share_room_with_user(
+            users_we_track = await self.store.get_users_who_share_room_with_user(
                 user_id
             )
+            users_we_track.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, users_we_track
             )
 
             # Step 1b, check for newly joined rooms
@@ -1168,7 +1169,7 @@ class SyncHandler(object):
                 newly_left_users.update(left_users)
 
             # Remove any users that we still share a room with.
-            newly_left_users -= users_who_share_room
+            newly_left_users -= users_we_track
 
             return DeviceLists(changed=users_that_have_changed, left=newly_left_users)
         else: