-
Notifications
You must be signed in to change notification settings - Fork 334
fix(timeline): maintain aggregations when an event is deduplicated #4576
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.
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
Merged
Changes from 22 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
9114f29
refactor(timeline): always unstash related pending reactions, even if…
bnjbvr 9061977
fix(timeline): when removing an item, re-stash its associated reactions
bnjbvr 99a5c36
refactor(timeline): keep poll aggregations around forever
bnjbvr 2ffd947
refactor(timeline): use TimelineEventItemId for aggregated items
bnjbvr 40c83f9
refactor!(timeline): put the reactions into the `TimelineItemContent`
bnjbvr 73691b3
refactor(timeline): apply reactions as aggregations
bnjbvr 5d257b3
refactor(timeline): remove unused `AnnotationKey`
bnjbvr fad2bcf
refactor(timeline): recall the id of the aggregated event
bnjbvr e52d1bd
refactor(timeline): apply reaction aggregation in place
bnjbvr 8b88167
refactor(timeline): get rid of two uses of `meta.reactions.map`
bnjbvr ba714d8
refactor(timeline): undo aggregations upon redaction
bnjbvr fbc6791
test(timeline): use the `EventFactory` for a reaction redaction
bnjbvr 51c7f77
refactor(timeline): rename `handle_reaction_redaction` to `handle_agg…
bnjbvr f4b27b3
test(timeline): avoid creating new `EventFactory` and reuse that in `…
bnjbvr 7fad47f
refactor(timeline): only replace an item when applying the aggregatio…
bnjbvr 44083b0
refactor(timeline): store the `ReactionStatus` in the Reaction aggreg…
bnjbvr 0c13347
refactor(timeline): maintain aggregation mappings after events have b…
bnjbvr 8a48ec1
test(timeline): use `assert_let_timeout` in one specific test of time…
bnjbvr 1e2d13e
refactor(timeline): apply clippy lints
bnjbvr 3578770
refactor(timeline): return owned `ReactionsByKeyBySender` in `Timelin…
bnjbvr 4fb6989
doc(timeline): add doc and changelog for the new aggregation system
bnjbvr da828c3
refactor(timeline): apply aggregations in a single place
bnjbvr 182f500
some review comments
bnjbvr 8d36423
review: remove outdated comment
bnjbvr 2ebcc44
review: demote log statement to info
bnjbvr 4b26a48
review: return an custom result type for `Aggregations::apply/unapply`
bnjbvr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand this comment - can you expand on it? If it's incorrect, do we need to fix it before we can commit this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yeah, something I noticed, and fixed in another PR; I can remove the comment now, thanks for spotting it!