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

Better fallback for unavailable event age #3854

Merged
merged 5 commits into from
Nov 6, 2023
Merged

Better fallback for unavailable event age #3854

merged 5 commits into from
Nov 6, 2023

Conversation

toger5
Copy link
Contributor

@toger5 toger5 commented Nov 3, 2023 •
edited by github-actions bot
Loading

This fixes an issue where state (particularly call member state) events were not considered expired even if they were very old. Resulted in us showing really old calls for rooms.
This applies: #3839 again after the tests were fixed downstream in the react sdk. matrix-org/matrix-react-sdk#11827

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

This change is marked as an internal change (Task), so will not be included in the changelog.

toger5 added 5 commits October 31, 2023 14:53
@toger5
Age fallback using origin_server_ts instead of 0
6cb2857 
Signed-off-by: Timo K <toger5@hotmail.de>
@toger5
use getMsUntilExpiry for isExpired
28bf044 
Signed-off-by: Timo K <toger5@hotmail.de>
@toger5
fix tests
dd0e67c 
tests now also rely on localTimestamp. So this need to be mocked as well

Signed-off-by: Timo K <toger5@hotmail.de>
@toger5
Merge branch 'develop' into toger5/better-fallback-for-unavailabel-ev…
4526dd7 
…ent-age

Signed-off-by: Timo K <toger5@hotmail.de>
@toger5
better fallback for unavailable unsigned
0df1c3d 
Signed-off-by: Timo K <toger5@hotmail.de>
@toger5 toger5 mentioned this pull request Nov 3, 2023
Merged
@toger5
Copy link
Contributor Author

toger5 commented Nov 3, 2023

Is there a way to run downstream test in the PR? without adding it to the merge queue?

@t3chguy
Copy link
Member

t3chguy commented Nov 3, 2023

@toger5 no, only locally

@toger5 toger5 added the T-Task Tasks for the team like planning label Nov 3, 2023
@toger5
Copy link
Contributor Author

toger5 commented Nov 3, 2023

I ran the unit tests for the matrix-react-sdk about 10 times now and they all succeeded with the fix from Midhun matrix-org/matrix-react-sdk#11827 with this js-sdk pr.

@toger5 toger5 marked this pull request as ready for review November 3, 2023 17:53
@toger5 toger5 requested review from a team as code owners November 3, 2023 17:53
@toger5 toger5 requested review from richvdh and t3chguy November 3, 2023 17:53
dbkr
dbkr approved these changes Nov 6, 2023
View reviewed changes
Copy link
Member

@dbkr dbkr left a comment

Choose a reason for hiding this comment

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

If you could put in the title / description that this is the same PR re-applied that would be good - took me diffing the PR against the old one to realise it was the same PR. :)

@richvdh richvdh changed the title Better fallback for unavailabel event age Better fallback for unavailable event age Nov 6, 2023
@richvdh richvdh removed their request for review November 6, 2023 12:06
@toger5 toger5 added this pull request to the merge queue Nov 6, 2023
Merged via the queue into develop with commit 84bd8ab Nov 6, 2023
45 of 46 checks passed
@toger5 toger5 deleted the toger5/better-fallback-for-unavailabel-event-age branch November 6, 2023 17:43
@richvdh richvdh mentioned this pull request Nov 9, 2023
Closed
richvdh added a commit that referenced this pull request Nov 9, 2023
@richvdh
Revert "Better fallback for unavailable event age (#3854)"
9a53e19 
This reverts commit 84bd8ab.
@richvdh richvdh mentioned this pull request Nov 9, 2023
Merged
github-merge-queue bot pushed a commit that referenced this pull request Nov 10, 2023
@richvdh
Revert "Better fallback for unavailable event age (#3854)" (#3870)
437b7ff 
This reverts commit 84bd8ab.
@t3chguy t3chguy added the X-Reverted PR has been reverted label Nov 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbkr dbkr dbkr approved these changes

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

Assignees
No one assigned
Labels
T-Task Tasks for the team like planning X-Reverted PR has been reverted
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@toger5 @t3chguy @dbkr