From 8f6f98acce8db6a660538d495aedcb7ea5c30f65 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Sep 2022 21:13:39 +0300 Subject: [PATCH] Update mautrix-go and add option to use MSC2409/MSC3202 for e2be data --- config/upgrade.go | 1 + example-config.yaml | 2 ++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config/upgrade.go b/config/upgrade.go index 5b8a855..80a2389 100644 --- a/config/upgrade.go +++ b/config/upgrade.go @@ -51,6 +51,7 @@ func DoUpgrade(helper *up.Helper) { helper.Copy(up.Bool, "bridge", "encryption", "allow") helper.Copy(up.Bool, "bridge", "encryption", "default") helper.Copy(up.Bool, "bridge", "encryption", "require") + helper.Copy(up.Bool, "bridge", "encryption", "appservice") helper.Copy(up.Bool, "bridge", "encryption", "allow_key_sharing") helper.Copy(up.Str, "bridge", "encryption", "verification_levels", "receive") helper.Copy(up.Str, "bridge", "encryption", "verification_levels", "send") diff --git a/example-config.yaml b/example-config.yaml index 06bf2e4..83f113d 100644 --- a/example-config.yaml +++ b/example-config.yaml @@ -155,6 +155,8 @@ bridge: # Default to encryption, force-enable encryption in all portals the bridge creates # This will cause the bridge bot to be in private chats for the encryption to work properly. default: false + # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. + appservice: false # Require encryption, drop any unencrypted messages. require: false # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled. diff --git a/go.mod b/go.mod index 418cc74..7875865 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/stretchr/testify v1.8.0 github.com/yuin/goldmark v1.4.13 maunium.net/go/maulogger/v2 v2.3.2 - maunium.net/go/mautrix v0.12.1-0.20220913092330-83f76bc2564a + maunium.net/go/mautrix v0.12.1-0.20220914153054-e61df9ab8b9b ) require ( diff --git a/go.sum b/go.sum index 3396603..cd39a63 100644 --- a/go.sum +++ b/go.sum @@ -73,5 +73,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0= maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A= -maunium.net/go/mautrix v0.12.1-0.20220913092330-83f76bc2564a h1:p1lHsdZ+RzCg4b4aqjSCTwBihcPpKF1SA08b6NSTRuE= -maunium.net/go/mautrix v0.12.1-0.20220913092330-83f76bc2564a/go.mod h1:/jxQFIipObSsjZPH6o3xyUi8uoULz3Hfr/8p9loqpYE= +maunium.net/go/mautrix v0.12.1-0.20220914153054-e61df9ab8b9b h1:VxVYn9Z8QDKkoNzPR1weXO1cyXapVaiKyljzoybS4Ok= +maunium.net/go/mautrix v0.12.1-0.20220914153054-e61df9ab8b9b/go.mod h1:/jxQFIipObSsjZPH6o3xyUi8uoULz3Hfr/8p9loqpYE=