summary refs log tree commit diff
path: root/synapse/storage/devices.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-30 17:56:19 +0000
committerGitHub <noreply@github.com>2017-01-30 17:56:19 +0000
commit4c9812f5da8ad854e9ec59fc4dfcadecdda70436 (patch)
treee7daec9cf524079f4c8da6031efb1358168bd20d /synapse/storage/devices.py
parentMerge pull request #1857 from matrix-org/erikj/device_list_stream (diff)
parentDon't have such a large cache (diff)
downloadsynapse-4c9812f5da8ad854e9ec59fc4dfcadecdda70436.tar.xz
Merge pull request #1861 from matrix-org/erikj/device_list_fixes
Device List fixes
Diffstat (limited to 'synapse/storage/devices.py')
-rw-r--r--synapse/storage/devices.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/devices.py b/synapse/storage/devices.py
index e68ee50152..f0353929da 100644
--- a/synapse/storage/devices.py
+++ b/synapse/storage/devices.py
@@ -164,6 +164,7 @@ class DeviceStore(SQLBaseStore):
             keyvalues={
                 "user_id": user_id,
             },
+            desc="mark_remote_user_device_list_as_unsubscribed",
         )
 
     def update_remote_device_list_cache_entry(self, user_id, device_id, content,
@@ -463,7 +464,7 @@ class DeviceStore(SQLBaseStore):
             SELECT user_id FROM device_lists_stream WHERE stream_id > ?
         """
         rows = yield self._execute("get_user_whose_devices_changed", None, sql, from_key)
-        defer.returnValue(set(row["user_id"] for row in rows))
+        defer.returnValue(set(row[0] for row in rows))
 
     def get_all_device_list_changes_for_remotes(self, from_key):
         """Return a list of `(stream_id, user_id, destination)` which is the