Skip to content
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

Don't decrement the length count of a thread when root redacted #2314

Merged
merged 2 commits into from
Apr 21, 2022

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Apr 21, 2022

The count is number of replies, in which the root is not included


Here's what your changelog entry will look like:

🐛 Bug Fixes

  • Don't decrement the length count of a thread when root redacted (#2314).

The count is number of replies, in which the root is not included
@t3chguy t3chguy requested a review from a team as a code owner April 21, 2022 13:37
Copy link
Contributor

@kerryarchibald kerryarchibald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

test?

@t3chguy t3chguy enabled auto-merge (squash) April 21, 2022 16:00
@codecov-commenter
Copy link

Codecov Report

Merging #2314 (bc01560) into develop (c0cb662) will increase coverage by 0.00%.
The diff coverage is 100.00%.

❗ Current head bc01560 differs from pull request most recent head 9df1fd6. Consider uploading reports for the commit 9df1fd6 to get more accurate results

@@           Coverage Diff            @@
##           develop    #2314   +/-   ##
========================================
  Coverage    59.74%   59.74%           
========================================
  Files           91       91           
  Lines        16449    16450    +1     
  Branches      3796     3797    +1     
========================================
+ Hits          9827     9828    +1     
  Misses        6622     6622           
Impacted Files Coverage Δ
src/models/thread.ts 76.42% <100.00%> (+0.16%) ⬆️

@t3chguy t3chguy merged commit e133005 into develop Apr 21, 2022
@t3chguy t3chguy deleted the t3chguy/threads-root-redaction branch April 21, 2022 16:02
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request May 10, 2022
* Live location sharing: handle encrypted messages in processBeaconEvents ([\matrix-org#2327](matrix-org#2327)).
* Fix race conditions around threads ([\matrix-org#2331](matrix-org#2331)). Fixes element-hq/element-web#21627.
* Ignore m.replace relations on state events, they're invalid ([\matrix-org#2306](matrix-org#2306)). Fixes element-hq/element-web#21851.
* fix example in readme ([\matrix-org#2315](matrix-org#2315)).
* Don't decrement the length count of a thread when root redacted ([\matrix-org#2314](matrix-org#2314)).
* Prevent attempt to create thread with id "undefined" ([\matrix-org#2308](matrix-org#2308)).
* Update threads handling for replies-to-thread-responses as per MSC update ([\matrix-org#2305](matrix-org#2305)). Fixes element-hq/element-web#19678.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants