diff options
author | Erik Johnston <erik@matrix.org> | 2017-06-27 14:46:12 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-06-27 14:46:12 +0100 |
commit | a0a561ae852c6a031f8611859d95e2ad563770ca (patch) | |
tree | c6e4bd6bd58526f2fcf21d96965c977aacee4d73 /synapse/handlers | |
parent | Batch upsert user ips (diff) | |
download | synapse-a0a561ae852c6a031f8611859d95e2ad563770ca.tar.xz |
Fix up client ips to read from pending data
Diffstat (limited to 'synapse/handlers')
-rw-r--r-- | synapse/handlers/device.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/device.py b/synapse/handlers/device.py index 982cda3edf..ed60d494ff 100644 --- a/synapse/handlers/device.py +++ b/synapse/handlers/device.py @@ -106,7 +106,7 @@ class DeviceHandler(BaseHandler): device_map = yield self.store.get_devices_by_user(user_id) ips = yield self.store.get_last_client_ip_by_device( - devices=((user_id, device_id) for device_id in device_map.keys()) + user_id, device_id=None ) devices = device_map.values() @@ -133,7 +133,7 @@ class DeviceHandler(BaseHandler): except errors.StoreError: raise errors.NotFoundError ips = yield self.store.get_last_client_ip_by_device( - devices=((user_id, device_id),) + user_id, device_id, ) _update_device_from_client_ips(device, ips) defer.returnValue(device) |