Skip to content

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

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 8 commits into from
Apr 9, 2026
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ecbb03
Switch list quarantined media API to use max to_id instead of current
turt2live Apr 9, 2026
dd3abf8
overlapping changelog
turt2live Apr 9, 2026
0ffbec7
await
turt2live Apr 9, 2026
675d36d
Update synapse/rest/admin/media.py
turt2live Apr 9, 2026
a456729
Restore to_id as current; Introduce max_id as max
turt2live Apr 9, 2026
49ad7a6
Apply suggestions from code review
turt2live Apr 9, 2026
a134c7f
Update synapse/rest/admin/media.py
turt2live Apr 9, 2026
c94df03
Update synapse/rest/admin/media.py
turt2live Apr 9, 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/19677.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

@MadLittleMods MadLittleMods Apr 9, 2026

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

👍

2 changes: 1 addition & 1 deletion synapse/rest/admin/media.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ async def on_GET(self, request: SynapseRequest) -> tuple[int, JsonDict]:

from_id = parse_integer(request, "from", default=0)
limit = 100 # arbitrary; not enough to cause problems (hopefully)
to_id = await self.store.get_current_quarantined_media_stream_id()
Comment thread
turt2live marked this conversation as resolved.
to_id = await self.store.get_max_quarantined_media_stream_id()

if to_id < from_id:
Comment thread
turt2live marked this conversation as resolved.
Outdated
# The caller is trying to get future data, which isn't possible.
Comment thread
turt2live marked this conversation as resolved.
Outdated
Expand Down
8 changes: 4 additions & 4 deletions synapse/storage/databases/main/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,13 +1302,13 @@ def _get_media_ids_by_user_txn(

return local_media_ids

async def get_current_quarantined_media_stream_id(self) -> int:
"""Gets the position of the quarantined media changes stream.
async def get_max_quarantined_media_stream_id(self) -> int:
Comment thread
turt2live marked this conversation as resolved.
Outdated
"""Gets the maximum position of the quarantined media changes stream.
Comment thread
turt2live marked this conversation as resolved.
Outdated

Returns:
int - the current stream ID
int - the maximum stream ID
"""
return self._quarantined_media_changes_id_gen.get_current_token()
return self._quarantined_media_changes_id_gen.get_max_allocated_token()

async def wait_for_quarantined_media_stream_id(self, target_id: int) -> bool:
"""Waits until the quarantined media changes stream reaches the given stream ID.
Expand Down
Loading