diff options
| author | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-07-06 10:36:25 +0100 |
| commit | 42b50483be2b022735f8ae2107314d51e92e8471 (patch) | |
| tree | 6b41c2096b105f04244ce80e840d0f998dbe226f /synapse/handlers/device.py | |
| parent | Merge pull request #2282 from matrix-org/release-v0.21.1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-42b50483be2b022735f8ae2107314d51e92e8471.tar.xz | |
Merge branch 'release-v0.22.0' of github.com:matrix-org/synapse v0.22.0
Diffstat (limited to 'synapse/handlers/device.py')
| -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) |