summary refs log tree commit diff
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-01-20 22:49:46 -0700
committerTravis Ralston <travpc@gmail.com>2018-01-20 22:49:46 -0700
commita94d9b6b825c6b2db375460268567e637e10709a (patch)
tree5edcf3438eb1aa0c98df9edf6f4f1a61316acf31
parentAdd an admin route to get all the media in a room (diff)
downloadsynapse-a94d9b6b825c6b2db375460268567e637e10709a.tar.xz
Appease the linter
These are ids anyways, not mxc uris.

Signed-off-by: Travis Ralston <travpc@gmail.com>
-rw-r--r--synapse/storage/room.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index cd6899a4b5..d1d63f4041 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -553,7 +553,7 @@ class RoomStore(SQLBaseStore):
         the associated media
         """
         def _quarantine_media_in_room(txn):
-            local_media_mxcs, remote_media_mxcs = self._get_media_ids_in_room(txn, room_id)
+            local_media_ids, remote_media_ids = self._get_media_ids_in_room(txn, room_id)
             total_media_quarantined = 0
 
             # Now update all the tables to set the quarantined_by flag
@@ -562,7 +562,7 @@ class RoomStore(SQLBaseStore):
                 UPDATE local_media_repository
                 SET quarantined_by = ?
                 WHERE media_id = ?
-            """, ((quarantined_by, media_id) for media_id in local_media_mxcs))
+            """, ((quarantined_by, media_id) for media_id in local_media_ids))
 
             txn.executemany(
                 """
@@ -572,12 +572,12 @@ class RoomStore(SQLBaseStore):
                 """,
                 (
                     (quarantined_by, origin, media_id)
-                    for origin, media_id in remote_media_mxcs
+                    for origin, media_id in remote_media_ids
                 )
             )
 
-            total_media_quarantined += len(local_media_mxcs)
-            total_media_quarantined += len(remote_media_mxcs)
+            total_media_quarantined += len(local_media_ids)
+            total_media_quarantined += len(remote_media_ids)
 
             return total_media_quarantined