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

Update Mutual Rooms (MSC2666) support #3381

Merged
merged 6 commits into from
Jun 5, 2023
Merged

Update Mutual Rooms (MSC2666) support #3381

merged 6 commits into from
Jun 5, 2023

Conversation

ShadowJonathan
Copy link
Contributor

@ShadowJonathan ShadowJonathan commented May 18, 2023 •
edited
Loading

This updates the Mutual Rooms (MSC2666) implementation to match the latest version.

This also cleans and clears up the support for older versions of the MSC. The new version paginates, and so that support has been added too.

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)

Type: Task

Signed-off-by: Jonathan de Jong <[email protected]>

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

@ShadowJonathan ShadowJonathan requested a review from a team as a code owner May 18, 2023 12:07
@ShadowJonathan ShadowJonathan mentioned this pull request May 18, 2023
Open
@github-actions github-actions bot added Z-Community-PR Issue is solved by a community member's PR T-Task Tasks for the team like planning labels May 18, 2023
@andybalaam
Copy link
Member

Thank you for your contribution! I'm looking at it now, but we have a (new since this was first implemented) requirement for 80% test coverage on any changes, so this will definitely need some tests before we can merge it.

@ShadowJonathan
Copy link
Contributor Author

I'm going to try to figure out how to make tests for this, with example responses for each MSC version, and a pagination test.

andybalaam
andybalaam requested changes May 18, 2023
View reviewed changes
Copy link
Member

@andybalaam andybalaam left a comment

Choose a reason for hiding this comment

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

Looks good, but needs tests. I suspect you could monkey-patch this.http.authedRequest with a mock, or maybe you can think of a better way.

src/client.ts Outdated Show resolved Hide resolved
@ShadowJonathan ShadowJonathan requested a review from andybalaam May 19, 2023 10:25
@ShadowJonathan
Copy link
Contributor Author

@andybalaam fetch-mock is ridiculously powerful, I used it after seeing the deprecation notes for TestClient, and then used this cheatsheet (plus other instances where it is used in the code) to make this test code.

@andybalaam
Copy link
Member

Focussing on stuck unreads, so not finding time for this, but I haven't forgotten 💚

@andybalaam andybalaam added this pull request to the merge queue Jun 5, 2023
@andybalaam
Copy link
Member

Thank you!

Merged via the queue into matrix-org:develop with commit 1a5af9d Jun 5, 2023
@ShadowJonathan ShadowJonathan deleted the update-mutual-rooms branch June 5, 2023 09:16
toger5 pushed a commit that referenced this pull request Jun 7, 2023
@ShadowJonathan @toger5
Update Mutual Rooms (MSC2666) support (#3381)
5976d69 
* update mutual rooms support

* clarify docs and switch eslint comment with todo

* please the holy linter

* change query variable names around

* add mock tests and fix issue

* ye holy linter
toger5 added a commit that referenced this pull request Jun 7, 2023
@toger5 @robintown
@renovate @t3chguy @richvdh @davidisaaclee @ShadowJonathan @stas-demydiuk @RiotRobot @andybalaam @weeman1337
Extend stats summary with call device and user count based on room st…
60c715d 
…ate (#3424)

* send expected peer connections to posthog.
(based on roomState event)

* add tests

* change GroupCallStats initialized

* prettier

* more test and catch for promise

* seperate the participant logic in a summary extend function

Signed-off-by: Timo K <[email protected]>

* remove unused

Signed-off-by: Timo K <[email protected]>

* rename summaryStatsReportGatherer to "Reporter"
for the summary stats there is only one instance because there is only
one summary. Since we dont have a list of gatherers it this class only reports.
Hence we rename it to be a reporter.

Signed-off-by: Timo K <[email protected]>

* review

Signed-off-by: Timo K <[email protected]>

* Update src/webrtc/stats/groupCallStats.ts

Co-authored-by: Robin <[email protected]>

* revert rename

Signed-off-by: Timo K <[email protected]>

* Update all non-major dependencies (#3433)

* Update all non-major dependencies

* Remove name wrap-ansi-cjs

* Remove name string-width-cjs

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <[email protected]>

* Update definitelyTyped (#3430)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <[email protected]>

* Export FALLBACK_ICE_SERVER (#3429)

* Add an integration test for verification (#3436)

* Move existing crypto integ tests into a subdirectory

* Factor out some common bits from `crypto.spec.ts`

* Integration test for device verification

* Ignore generated file in prettier

* Always show a summary after Jest tests (#3440)

... because it is otherwise impossible to see what failed.

* Use correct /v3 prefix for /refresh (#3016)

* Add tests to ensure /v3/refresh is called + automatic /v1 retry

* Request /refresh with v3 prefix, and quietly fall back to v1

* Add tests checking re-raising errors

* Update spec/unit/login.spec.ts

* Update comment

Co-authored-by: Richard van der Hoff <[email protected]>

---------

Co-authored-by: Richard van der Hoff <[email protected]>

* Update Mutual Rooms (MSC2666) support (#3381)

* update mutual rooms support

* clarify docs and switch eslint comment with todo

* please the holy linter

* change query variable names around

* add mock tests and fix issue

* ye holy linter

* GHA: build and cypress-test a copy of element-web after each push (#3412)

* Build a copy of element-web after each push

* Run cypress after each build of element-web

* Fix downstream-artifacts build (#3443)

* Fix downstream-artifacts build

* Update cypress.yml

* Fix edge cases around 2nd order relations and threads (#3437)

* Fix tests oversimplifying threads fixtures

* Check for unsigned thread_id in MatrixEvent::threadRootId

* Fix threads order being racy

* Make Sonar happier

* Iterate

* Make sliding sync linearize processing of sync requests (#3442)

* Make sliding sync linearize processing of sync requests

* Iterate

* Iterate

* Iterate

* Iterate

* Disable downstream artifacts build for develop branch (#3444)

* Export thread-related types from SDK (#3447)

* Export thread-related types from SDK

* address PR feedback

* Integration test for QR code verification (#3439)

* Integration test for QR code verification

Followup to #3436: another
integration test, this time using the QR code flow

* Use Object.defineProperty, and restore afterwards

Apparently global.crypto exists in some environments

* apply ts-ignore

* remove stray comment

* Update spec/integ/crypto/verification.spec.ts

* Add `getShowSasCallbacks`, `getShowQrCodeCallbacks` to VerifierBase (#3422)

* Add `getShowSasCallbacks`, `getShowQrCodeCallbacks` to VerifierBase

... to avoid some type-casting

* Integration test for QR code verification

Followup to #3436: another
integration test, this time using the QR code flow

* Rename method

... it turns out not to be used quite as I thought.

* tests for new methods

* Use Object.defineProperty, and restore afterwards

Apparently global.crypto exists in some environments

* apply ts-ignore

* More test coverage

* fix bad merge

* Fix changelog_head.py script to be Python 3 compatible

* Prepare changelog for v25.2.0-rc.1

* v25.2.0-rc.1

* Fix tsconfig-build.json

* Prepare changelog for v25.2.0-rc.2

* v25.2.0-rc.2

* Fix docs deployment

* Prepare changelog for v25.2.0-rc.3

* v25.2.0-rc.3

* Prepare changelog for v25.2.0-rc.4

* v25.2.0-rc.4

* [Backport staging] Attempt a potential workaround for stuck notifs (#3387)

Co-authored-by: Andy Balaam <[email protected]>

* Prepare changelog for v25.2.0-rc.5

* v25.2.0-rc.5

* [Backport staging] Fix mark as unread button (#3401)

Co-authored-by: Michael Weimann <[email protected]>

* Prepare changelog for v26.0.0-rc.1

* v26.0.0-rc.1

* Prepare changelog for v26.0.0

* v26.0.0

* Resetting package fields for development

* use cli.canSupport to determine intentional mentions support (#3445)

* use cli.canSupport to determine intentional mentions support

* more specific comment

* Update src/client.ts

Co-authored-by: Michael Telatynski <[email protected]>

---------

Co-authored-by: Michael Telatynski <[email protected]>

* git fixup

Signed-off-by: Timo K <[email protected]>

* import updates

Signed-off-by: Timo K <[email protected]>

* dont revert enricos change

Signed-off-by: Timo K <[email protected]>

* temp rename for lowercase

* lowercase

---------

Signed-off-by: Timo K <[email protected]>
Co-authored-by: Robin <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <[email protected]>
Co-authored-by: Richard van der Hoff <[email protected]>
Co-authored-by: David Lee <[email protected]>
Co-authored-by: Jonathan de Jong <[email protected]>
Co-authored-by: Stanislav Demydiuk <[email protected]>
Co-authored-by: ElementRobot <[email protected]>
Co-authored-by: Andy Balaam <[email protected]>
Co-authored-by: Michael Weimann <[email protected]>
Co-authored-by: Kerry <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andybalaam andybalaam andybalaam approved these changes

@artcodespace artcodespace Awaiting requested review from artcodespace artcodespace 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 Z-Community-PR Issue is solved by a community member's PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ShadowJonathan @andybalaam