Replace wait_for_quarantined_media_stream_id(...) with standard wait_for_stream_token(...)#19764
Merged
MadLittleMods merged 6 commits intoMay 15, 2026
Conversation
MadLittleMods
added
A-Admin-API
A-Media-Repository
A-Abuse
MadLittleMods
commented
May 7, 2026
Comment on lines
-1324
to
-1326
| See https://github.com/element-hq/synapse/pull/19644 for more details. | ||
|
|
||
| TODO: Replace function and call sites with https://github.com/element-hq/synapse/pull/19644 |
Contributor
Author
There was a problem hiding this comment.
Removing wait_for_quarantined_media_stream_id(...) as planned ^
3 tasks
MadLittleMods
commented
May 8, 2026
Comment on lines
-259
to
-260
| # resources on that which is why `wait_for_quarantined_media_stream_id(...)` | ||
| # has assertions around this. |
Contributor
Author
There was a problem hiding this comment.
Removed the last part of this comment as wait_for_stream_token(...) no longer has these assertions (#19644 used to have it but was removed per #19644 (comment))
MadLittleMods
commented
May 8, 2026
| ) | ||
| thread_subscriptions_key = self.store.get_max_thread_subscriptions_stream_id() | ||
| sticky_events_key = self.store.get_max_sticky_events_stream_id() | ||
| quarantined_media_key = self.store.get_quarantined_media_stream_token() |
Contributor
Author
There was a problem hiding this comment.
The rest of this is just boilerplate to add quarantined_media to the StreamToken
anoadragon453
approved these changes
May 15, 2026
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
…of github.com:element-hq/synapse into madlittlemods/quarantined-media-wait-for-stream-token
MadLittleMods
deleted the
madlittlemods/quarantined-media-wait-for-stream-token
branch
Contributor
Author
|
Thanks for the review @anoadragon453 🐙 |
FrenchGithubUser
pushed a commit
to famedly/synapse-upstreaming
that referenced
this pull request
Jun 12, 2026
…it_for_stream_token(...)` (element-hq#19764) In order to be able to use `wait_for_stream_token(...)`, we have to add the `quarantined_media` stream to the `StreamToken`. Even though we don't care about `/sync`'ing `quarantined_media`, this aligns with the future where all endpoints should probably use `StreamToken`, see element-hq#19647 Follow-up to element-hq#19558 and element-hq#19644
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replace
wait_for_quarantined_media_stream_id(...)with standardwait_for_stream_token(...).In order to be able to use
wait_for_stream_token(...), we have to add thequarantined_mediastream to theStreamToken. Even though we don't care about/sync'ingquarantined_media, this aligns with the future where all endpoints should probably useStreamToken, see #19647Follow-up to #19558 and #19644
Dev notes
Pull Request Checklist
EventStoretoEventWorkerStore.".code blocks.