Skip to content

Fix zeroing out remote quarantined media count #19559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
turt2live merged 4 commits into from
Mar 18, 2026
Merged

Fix zeroing out remote quarantined media count #19559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b03cfe
Fix zeroing out remote quarantined media count
turt2live Mar 14, 2026
98f9f81
changelog
turt2live Mar 14, 2026
8428943
Merge branch 'develop' into travis/fix-quarantined-count
turt2live Mar 16, 2026
7b30594
Merge branch 'develop' into travis/fix-quarantined-count
turt2live Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/19559.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix quarantine media admin APIs sometimes returning inaccurate counts for remote media.
1 change: 0 additions & 1 deletion synapse/storage/databases/main/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,6 @@ def _quarantine_remote_media_txn(
txn.execute(sql, [quarantined_by] + sql_args)
total_media_quarantined += txn.rowcount if txn.rowcount > 0 else 0

total_media_quarantined = 0
if hashes:
sql_many_clause_sql, sql_many_clause_args = make_in_list_sql_clause(
txn.database_engine, "sha256", hashes
Expand Down
Loading