refactor(media): some preparatory refactorings #4140
Merged
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
…ding the content The tails of the prepare_attachment_message and prepare_encrypted_attachment_message were almost the same, with the one different that they were using different ctors for the `EventContent` types. In fact, all these `EventContent` types also expose a plain `new` function that can take in either an encrypted or a plain media source, so we can commonize the code there.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4140 +/- ##
==========================================
+ Coverage 84.72% 84.81% +0.09%
==========================================
Files 269 269
Lines 28779 28759 -20
==========================================
+ Hits 24384 24393 +9
+ Misses 4395 4366 -29 ☔ View full report in Codecov by Sentry. |
jplatte
reviewed
Oct 16, 2024
crates/matrix-sdk/src/media.rs
Outdated
Comment on lines
545
to
547
| let mut content = ImageMessageEventContent::plain(body, url).info(Box::new(info)); | ||
| content.filename = filename; | ||
| content.formatted = config.formatted_caption; |
There was a problem hiding this comment.
Could also use the assign! macro here (I think I saw it still being used in a bunch of other places). Same for the other changes in this commit.
There was a problem hiding this comment.
Yep, make_attachment in the latest version does maximally use assign!, IMO 👍
…tion_id` This allows letting the caller whether they need to clone it or not, and avoids a spurious clone in one call site.
…caller The name wasn't very descriptive, and it's tweaking the content, so let's do that in place, instead of deferring to another method somewhere else in the codebase.
…tedFile` Changelog: Renamed `PrepareEncryptedFile` and `Client::prepare_encrypted_file` to `UploadEncryptedFile` and `Client::upload_encrypted_file`.
4 tasks
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.
aka "Benjamin tries to make sense of the media code. Oh, nice: it makes sense."
Part of #1732.