fix(send_queue): Use MediaFormat::File when caching attachment thumbnail
#4400
Conversation
This file contains 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
The `MediaFormat` reflects only the request that would be made to the homeserver. There is no link between the format of the files stored in the media cache and their purpose in an event. `MediaFormat::Tumbnail` means that we request a server-generated thumbnail of a file in the media repository. Since the thumbnail is its own file in the media repository, it makes more sense to use `MediaFormat::File`. Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Signed-off-by: Kévin Commaille <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4400 +/- ##
==========================================
- Coverage 85.25% 85.22% -0.03%
==========================================
Files 282 282
Lines 31065 31064 -1
==========================================
- Hits 26483 26475 -8
- Misses 4582 4589 +7 ☔ View full report in Codecov by Sentry. |
bnjbvr
approved these changes
Dec 10, 2024
| let from_req = | ||
| Media::make_local_thumbnail_media_request(&info.txn, info.height, info.width); | ||
| // Previously the media request used `MediaFormat::Thumbnail`. Handle this case | ||
| // for send queue requests that were in the state store before the change. |
There was a problem hiding this comment.
This is about DependentQueuedRequestKind, so the state store, right?
Comment on lines
+101
to
+104
| /// The attachment and its optional thumbnail are stored in the media cache | ||
| /// and can be retrieved at any time, by calling | ||
| /// [`Media::get_media_content()`] with the `MediaSource` that can be found | ||
| /// in the local or remote echo, and using a `MediaFormat::File`. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix extracted from #4329.
The
MediaFormatreflects only the request that would be made to the homeserver. There is no link between the format of the files stored in the media cache and their purpose in an event.MediaFormat::Thumbnailmeans that we request a server-generated thumbnail of a file in the media repository. Since the thumbnail is its own file in the media repository, it makes more sense to useMediaFormat::File. See #4329 (comment) for even more details why this change makes sense.The fix was simplified a lot here. Instead of requiring a migration, we just minimize the changes in the format of the send queue request in the state store and keep handling the previous case.
This also documents the caching of the media when calling
send_attachment.