diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2022-06-07 11:53:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-07 10:53:47 +0000 |
| commit | a47636c570c80928af7652d70073496f602511bc (patch) | |
| tree | fe7d7c6471940dbaf73d27e3ace667bcfb2725bd /synapse/rest/admin | |
| parent | Remove remaining pieces of groups code. (#12966) (diff) | |
| download | synapse-a47636c570c80928af7652d70073496f602511bc.tar.xz | |
Prevent local quarantined media from being claimed by media retention (#12972)
Diffstat (limited to 'synapse/rest/admin')
| -rw-r--r-- | synapse/rest/admin/media.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/rest/admin/media.py b/synapse/rest/admin/media.py index 8ca57bdb28..19d4a008e8 100644 --- a/synapse/rest/admin/media.py +++ b/synapse/rest/admin/media.py @@ -83,7 +83,7 @@ class QuarantineMediaByUser(RestServlet): requester = await self.auth.get_user_by_req(request) await assert_user_is_admin(self.auth, requester.user) - logging.info("Quarantining local media by user: %s", user_id) + logging.info("Quarantining media by user: %s", user_id) # Quarantine all media this user has uploaded num_quarantined = await self.store.quarantine_media_ids_by_user( @@ -112,7 +112,7 @@ class QuarantineMediaByID(RestServlet): requester = await self.auth.get_user_by_req(request) await assert_user_is_admin(self.auth, requester.user) - logging.info("Quarantining local media by ID: %s/%s", server_name, media_id) + logging.info("Quarantining media by ID: %s/%s", server_name, media_id) # Quarantine this media id await self.store.quarantine_media_by_id( @@ -140,9 +140,7 @@ class UnquarantineMediaByID(RestServlet): ) -> Tuple[int, JsonDict]: await assert_requester_is_admin(self.auth, request) - logging.info( - "Remove from quarantine local media by ID: %s/%s", server_name, media_id - ) + logging.info("Remove from quarantine media by ID: %s/%s", server_name, media_id) # Remove from quarantine this media id await self.store.quarantine_media_by_id(server_name, media_id, None) |