feat(timeline): handle more timeline item content kinds in replied-to details #4649
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
bnjbvr
force-pushed
the
bnjbvr/reply-details
branch
from
e95e74c to
af30b47
Compare
|
Note for reviewers: don't be afraid by the number of LOC, there are many repetitive tests in there. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4649 +/- ##
=======================================
Coverage 85.68% 85.68%
=======================================
Files 292 292
Lines 33570 33597 +27
=======================================
+ Hits 28763 28788 +25
- Misses 4807 4809 +2 ☔ View full report in Codecov by Sentry. |
jplatte
approved these changes
Feb 11, 2025
Comment on lines
403
to
412
| let utd_info = as_variant!( | ||
| &timeline_event.kind, | ||
| TimelineEventKind::UnableToDecrypt { utd_info, .. } => utd_info | ||
| ); | ||
|
|
||
| let utd_cause = if let Some(utd_info) = utd_info { | ||
| UtdCause::determine( | ||
| timeline_event.raw(), | ||
| room_data_provider.crypto_context_info().await, | ||
| &utd_info, | ||
| ) | ||
| } else { | ||
| UtdCause::Unknown | ||
| }; |
There was a problem hiding this comment.
Seems simpler to use a single match for this, no?
poljar
approved these changes
Feb 12, 2025
| let content = match event.original_content() { | ||
| Some(content) => match content { | ||
| AnyMessageLikeEventContent::RoomMessage(c) => { | ||
| // Assume we're not interested in reactions in this context. |
There was a problem hiding this comment.
It might make sense to explain why we're not interested.
There was a problem hiding this comment.
Good point, edited with this comment:
// Assume we're not interested in reactions in this context: this is
// information for an embedded (replied-to) event, that will usually not
// include detailed information like reactions.| ) => { | ||
| // Assume we're not interested in reactions in this context. | ||
| let reactions = ReactionsByKeyBySender::default(); | ||
| // TODO could we provide the bundled edit here? |
There was a problem hiding this comment.
Suggested change
| // TODO could we provide the bundled edit here? | |
| // TODO: could we provide the bundled edit here? |
bnjbvr
force-pushed
the
bnjbvr/reply-details
branch
from
fdde8f1 to
335d884
Compare
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.
Right now, the replied-to details can only contain information about a room message, while we can have other timeline item contents for an item. In particular, the replied-to event could be still encrypted (UTD), and that shouldn't be considered an "unsupported kind", as in element-hq/element-x-ios#3774. Instead, consumers can display the replied-to event was a UTD, and perform manual retries in the background later on (after a backup key has been downloaded, for instance).
Remaining tasks:
[ ] Since the code getting aTimelineItemContentfrom a Ruma event is so similar to the code used when handling an event, I'm planning to attempt to merge the two.