OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Appease the linter 

These are ids anyways, not mxc uris.

Signed-off-by: Travis Ralston <travpc@gmail.com>
pull/2818/head
Travis Ralston 2018-01-20 22:49:46 -07:00
parent 5552ed9a7f
commit a94d9b6b82
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/storage/room.py
View File

@ -553,7 +553,7 @@ class RoomStore(SQLBaseStore):
the associated media the associated media
""" """
def _quarantine_media_in_room(txn): 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 total_media_quarantined = 0
# Now update all the tables to set the quarantined_by flag # Now update all the tables to set the quarantined_by flag
@ -562,7 +562,7 @@ class RoomStore(SQLBaseStore):
UPDATE local_media_repository UPDATE local_media_repository
SET quarantined_by = ? SET quarantined_by = ?
WHERE media_id = ? 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( txn.executemany(
""" """
@ -572,12 +572,12 @@ class RoomStore(SQLBaseStore):
""", """,
( (
(quarantined_by, origin, media_id) (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(local_media_ids)
total_media_quarantined += len(remote_media_mxcs) total_media_quarantined += len(remote_media_ids)
return total_media_quarantined return total_media_quarantined