Skip to content

Commit def1c96

Browse files
turt2liveFrenchGithubUser
authored andcommitted
Fix zeroing out remote quarantined media count (element-hq#19559)
Just something I noticed while working on element-hq#19558 We start the function by setting `total_media_quarantined` to zero, then we do work on the `media_ids`, add the number affected, zero it out (**bug**), do work on `hashes`, add the number of affected rows, then return `total_media_quarantined`. ### Pull Request Checklist <!-- Please read https://element-hq.github.io/synapse/latest/development/contributing_guide.html before submitting your pull request --> * [x] Pull request is based on the develop branch * [x] Pull request includes a [changelog file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog). The entry should: - Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from `EventStore` to `EventWorkerStore`.". - Use markdown where necessary, mostly for `code blocks`. - End with either a period (.) or an exclamation mark (!). - Start with a capital letter. - Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry. * [x] [Code style](https://element-hq.github.io/synapse/latest/code_style.html) is correct (run the [linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))
1 parent b37c22e commit def1c96

2 files changed

Lines changed: 1 addition & 1 deletion

File tree

changelog.d/19559.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix quarantine media admin APIs sometimes returning inaccurate counts for remote media.

synapse/storage/databases/main/room.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,6 @@ def _quarantine_remote_media_txn(
12171217
txn.execute(sql, [quarantined_by] + sql_args)
12181218
total_media_quarantined += txn.rowcount if txn.rowcount > 0 else 0
12191219

1220-
total_media_quarantined = 0
12211220
if hashes:
12221221
sql_many_clause_sql, sql_many_clause_args = make_in_list_sql_clause(
12231222
txn.database_engine, "sha256", hashes

0 commit comments

Comments
 (0)