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

Update main branch to current v0.6.5 pre-release state #7

Merged
merged 22 commits into from
Mar 27, 2023

Conversation

turt2live
Copy link
Member

Includes v0.6.4+patches (not yet released as v0.6.5 upstream)

AndrewFerr and others added 22 commits December 19, 2022 16:05
* Refresh joined rooms when enabling crypto

When enabling crypto on an Intent, refresh its list of joined rooms,
as it's used to determine which rooms to watch for crypto updates.

This fixes an issue where a restart would cause Intents to lose track of
which rooms they were joined to, until the list is refreshed either
manually or in response to a membership event.

Signed-off-by: Andrew Ferrazzutti <andrewf@element.io>

* Update src/appservice/Intent.ts

Signed-off-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Travis Ralston <travpc@gmail.com>
* Query & claim needed keys before encrypting

Ensure that the bot has all keys needed for sharing a room key with
recipients before encryping an event in that room.

Signed-off-by: Andrew Ferrazzutti <andrewf@element.io>

* Change public API signature for RustEngine

* Move KeysQuery into lock for safety

Signed-off-by: Andrew Ferrazzutti <andrewf@element.io>
Co-authored-by: Travis Ralston <travpc@gmail.com>
Clients don't support encrypted reactions.
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](json5/json5@v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…e#300)

* Permalinks should be able to decode and encode via servers.

Previously it was skipping `&via` and just joining `via` when there were more servers.
And it also just would not attempt to parse via servers when there was no event id to go with a room.

turt2live#299
Signed-off-by: gnuxie <Gnuxie@protonmail.com>

* Accurate documentation.

* Use encodeURIComponent for Permalink components.

* Edge cases in Permalinks.

* Test Permalinks are URI encoded but can still decode bodged URIs.

* Revert "Use encodeURIComponent for Permalink components."

This reverts commit f4e106c.

* Revert "Test Permalinks are URI encoded but can still decode bodged URIs."

This reverts commit 2f7c724.

* Update test/helpers/PermalinksTest.ts

---------

Signed-off-by: gnuxie <Gnuxie@protonmail.com>
Co-authored-by: Travis Ralston <travpc@gmail.com>
Co-authored-by: Travis Ralston <travis+github@t2bot.io>
…#306)

* Expose MSC3202 extensions over the appservice EventEmitter

* Ensure backwards compatibility with <Synapse 1.73

* Appease the linter
* Support MSC3983: Keys Claim request

See matrix-org/matrix-spec-proposals#3983

* Include test code

* Appease the linter
…urt2live#309)

* Correctly detect Authorization header from appservice API requests

* remove spaces

* Stop the appservice at the end of the test
* Return 405 M_UNRECOGNIZED per spec on unknown endpoints

* actually, it's a 404

* Appease the linter

* Stop the appservice at the end of the test

* Move test to avoid merge conflicts
Signed-off-by: Dominik Henneke <dominik.henneke@nordeck.net>
* Support MSC3984: Keys Query request

* Add unit tests
Just in case it updates and breaks something
@turt2live turt2live requested a review from a team as a code owner March 24, 2023 22:39
Copy link
Member

@Half-Shot Half-Shot left a comment

Choose a reason for hiding this comment

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

This looks all fine, and I assume it's gone through some review before.

@@ -36,7 +36,7 @@ const worksImage = fs.readFileSync("./examples/static/it-works.png");
const registration: IAppserviceRegistration = {
"as_token": creds?.['asToken'] ?? "change_me",
"hs_token": creds?.['hsToken'] ?? "change_me",
"sender_localpart": "crypto_main_bot_user",
"sender_localpart": "crypto_main_bot_user2",
Copy link
Member

Choose a reason for hiding this comment

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

random 2 though? :)

Copy link
Member Author

Choose a reason for hiding this comment

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

upstream thing - the example fields change constantly because they're also debug scripts.

@turt2live
Copy link
Member Author

I assume it's gone through some review before.

it has not, practically. This is upstream -> fork, and all the bits that come with it. The only "review" has been me testing my own code :p

If it still looks good though, can merge.

@Half-Shot
Copy link
Member

It looks good from a glance and I trust you.

@turt2live turt2live merged commit cbcc8ef into element-main Mar 27, 2023
@turt2live turt2live deleted the travis/update branch March 27, 2023 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants