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.

Sign up for GitHub

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

Jump to bottom

Ensure we don't overinflate the total notification count #3634

Merged
merged 4 commits into from
Jul 28, 2023
Merged

Ensure we don't overinflate the total notification count #3634

merged 4 commits into from
Jul 28, 2023

Conversation

t3chguy
Copy link
Member

@t3chguy t3chguy commented Jul 28, 2023 •
edited by github-actions bot
Loading

By correctly comparing push rules before & after decryption
I suggest reviewing commit-by-commit

Fixes element-hq/element-web#25803

Here's what your changelog entry will look like:

🐛 Bug Fixes

t3chguy added 3 commits July 28, 2023 09:25
@t3chguy
Ensure we don't overinflate the total notification count
c1e835e 
By correctly comparing push rules before & after decryption
@t3chguy
DRY the code
9d0af15
@t3chguy
Testsssss
5d93151
@t3chguy t3chguy requested a review from a team as a code owner July 28, 2023 08:40
germain-gg
germain-gg approved these changes Jul 28, 2023
View reviewed changes
Copy link
Contributor

@germain-gg germain-gg left a comment

Choose a reason for hiding this comment

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

Looks sane!

@t3chguy t3chguy added this pull request to the merge queue Jul 28, 2023
Merged via the queue into develop with commit fd0c4a7 Jul 28, 2023
@t3chguy t3chguy deleted the t3chguy/fix/25803 branch July 28, 2023 15:19
This was referenced Jul 31, 2023
Closed
Closed
t3chguy added a commit that referenced this pull request Jul 31, 2023
@t3chguy
Revert "Ensure we don't overinflate the total notification count (#3634…
df84fdc 
…)"

This reverts commit fd0c4a7.
@t3chguy t3chguy mentioned this pull request Jul 31, 2023
Merged
t3chguy added a commit that referenced this pull request Jul 31, 2023
@t3chguy
Revert "Ensure we don't overinflate the total notification count (#3634…
1744f0e 
…)" (#3639)
t3chguy added a commit that referenced this pull request Jul 31, 2023
@t3chguy
Revert "Ensure we don't overinflate the total notification count (#3634…
aa0ebb0 
…)"

This reverts commit fd0c4a7.
github-merge-queue bot pushed a commit that referenced this pull request Aug 2, 2023
@t3chguy
Fix wrong handling of encrypted rooms when loading them from sync acc…
2172f28 
…umulator (#3640)

* Revert "Ensure we don't overinflate the total notification count (#3634)"

This reverts commit fd0c4a7.

* Fix wrong handling of encrypted rooms when loading them from sync accumulator

* Tidy up code, removing sections which didn't make any difference

* Add test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@germain-gg germain-gg germain-gg approved these changes

@SimonBrandner SimonBrandner Awaiting requested review from SimonBrandner SimonBrandner is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Defect
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Notification count is doubled in e2ee rooms on startup
2 participants
@t3chguy @germain-gg