Skip to content

Switch list quarantined media API to use max to_id instead of current#19677

Merged
turt2live merged 8 commits into
developfrom
travis/lqm-hma-fix1
Apr 9, 2026
Merged

Switch list quarantined media API to use max to_id instead of current#19677
turt2live merged 8 commits into
developfrom
travis/lqm-hma-fix1

Conversation

@turt2live

@turt2live turt2live commented Apr 9, 2026

Copy link
Copy Markdown
Member

Following up on #19558 (comment)

Changelog for this PR is intended to overlap with the above PR.

get_current_quarantined_media_stream_id wasn't being used anywhere else, so we can replace it like we do in this PR.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. 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.
  • Code style is correct (run the linters)

@turt2live turt2live marked this pull request as ready for review April 9, 2026 20:04
@turt2live turt2live requested a review from a team as a code owner April 9, 2026 20:04
Comment thread synapse/rest/admin/media.py
Comment thread synapse/rest/admin/media.py Outdated
Comment thread synapse/rest/admin/media.py Outdated
Comment thread changelog.d/19677.feature
@@ -0,0 +1 @@
Add a ["Listing quarantined media changes" Admin API](https://element-hq.github.io/synapse/latest/admin_api/media_admin_api.html#listing-quarantined-media-changes) for retrieving a paginated record of when media became (un)quarantined. No newline at end of file

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Matches the changelog from #19558 so they merge

👍

@turt2live turt2live requested a review from MadLittleMods April 9, 2026 20:36
Comment thread synapse/storage/databases/main/room.py Outdated
Comment thread synapse/rest/admin/media.py Outdated
Comment thread synapse/storage/databases/main/room.py Outdated
Comment thread synapse/rest/admin/media.py Outdated
Co-authored-by: Eric Eastwood <madlittlemods@gmail.com>
Co-authored-by: Travis Ralston <travpc@gmail.com>
@turt2live turt2live enabled auto-merge (squash) April 9, 2026 20:46
Comment thread synapse/rest/admin/media.py Outdated
Co-authored-by: Eric Eastwood <erice@element.io>
Comment thread synapse/rest/admin/media.py
Co-authored-by: Eric Eastwood <erice@element.io>
@turt2live turt2live merged commit a7b87e2 into develop Apr 9, 2026
79 of 81 checks passed
@turt2live turt2live deleted the travis/lqm-hma-fix1 branch April 9, 2026 22:06
@MadLittleMods MadLittleMods added A-Admin-API A-Media-Repository A-Abuse Reports, media quarantine, policy servers, etc labels Apr 9, 2026
FrenchGithubUser pushed a commit to famedly/synapse-upstreaming that referenced this pull request Jun 12, 2026
…element-hq#19677)

Following up on
element-hq#19558 (comment)

Changelog for this PR is intended to overlap with the above PR.

`get_current_quarantined_media_stream_id` wasn't being used anywhere
else, so we can replace it like we do in this PR.

### 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))

---------

Co-authored-by: Eric Eastwood <erice@element.io>
Co-authored-by: Eric Eastwood <madlittlemods@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Abuse Reports, media quarantine, policy servers, etc A-Admin-API A-Media-Repository

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants