From 30c5be305a631b1ffc94f0e7c3b20ac25dcc4482 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 14 Jun 2022 18:58:12 +0300 Subject: [PATCH] Update dependencies and changelog --- CHANGELOG.md | 4 +++- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- main.go | 4 ++-- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cae0faa..260083e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ -# unreleased +# v0.5.0 (unreleased) * Moved a lot of code to mautrix-go. * Improved handling edge cases in backfill system. * Improved handling errors in Matrix->WhatsApp message bridging. +* Disallowed sending status broadcast messages by default, as it breaks with + big contact lists. Sending can be re-enabled in the config. * Fixed some cases where the first outgoing message was undecryptable for WhatsApp users. * Fixed chats not being marked as read when sending a message from another diff --git a/go.mod b/go.mod index 76d71b7..623a812 100644 --- a/go.mod +++ b/go.mod @@ -7,15 +7,15 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/lib/pq v1.10.6 github.com/mattn/go-sqlite3 v1.14.13 - github.com/prometheus/client_golang v1.12.2-0.20220514081015-5d584e2717ef + github.com/prometheus/client_golang v1.12.2-0.20220613221938-ebd77f036066 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/tidwall/gjson v1.14.1 - go.mau.fi/whatsmeow v0.0.0-20220604174810-f28d984f1b9a + go.mau.fi/whatsmeow v0.0.0-20220614154415-5718022af87c golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 golang.org/x/net v0.0.0-20220513224357-95641704303c google.golang.org/protobuf v1.28.0 maunium.net/go/maulogger/v2 v2.3.2 - maunium.net/go/mautrix v0.11.1-0.20220531155421-43e9bc0bdd59 + maunium.net/go/mautrix v0.11.1-0.20220606163838-f8f9fe45cbe1 ) require ( @@ -33,7 +33,7 @@ require ( github.com/yuin/goldmark v1.4.12 // indirect go.mau.fi/libsignal v0.0.0-20220425070825-c40c839ee6a0 // indirect golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect - golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 // indirect + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/text v0.3.7 // indirect gopkg.in/yaml.v3 v3.0.0 // indirect maunium.net/go/mauflag v1.0.0 // indirect diff --git a/go.sum b/go.sum index 028fea3..aee405c 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,8 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.12.2-0.20220514081015-5d584e2717ef h1:KiLlWhpmM0bnHFzpeD0fvf1fSEnq26eo/473u+PHTPQ= -github.com/prometheus/client_golang v1.12.2-0.20220514081015-5d584e2717ef/go.mod h1:WKeV0XXB7nmFMzPZR6ZBfkkm8gu5PBcyWVMf0qTHDX4= +github.com/prometheus/client_golang v1.12.2-0.20220613221938-ebd77f036066 h1:B9JCoyM8EhzBWyy7nshgpIlgRPbML8qB3aChJP5+d20= +github.com/prometheus/client_golang v1.12.2-0.20220613221938-ebd77f036066/go.mod h1:nDOYPpTKRWyFSHGWY5QbDUvjSMBusROfFzxhmDKUNWo= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.34.0 h1:RBmGO9d/FVjqHT0yUGQwBJhkwKV+wPCn7KGpvfab0uE= @@ -62,8 +62,8 @@ github.com/yuin/goldmark v1.4.12 h1:6hffw6vALvEDqJ19dOJvJKOoAOKe4NDaTqvd2sktGN0= github.com/yuin/goldmark v1.4.12/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mau.fi/libsignal v0.0.0-20220425070825-c40c839ee6a0 h1:3IQF2bgAyibdo77hTejwuJe4jlypj9QaE4xCQuxrThM= go.mau.fi/libsignal v0.0.0-20220425070825-c40c839ee6a0/go.mod h1:kBOXTvYyDG/q1Ihgvd4J6WenGPh7wtEGvPKF6vmf5ak= -go.mau.fi/whatsmeow v0.0.0-20220604174810-f28d984f1b9a h1:kLIh5zAEvEMK8k8Qg2aU6aMDfJmrf5+XJ3t3Q3ZCV7o= -go.mau.fi/whatsmeow v0.0.0-20220604174810-f28d984f1b9a/go.mod h1:iUBgOLNaqShLrR17u0kIiRptIGFH+nbT1tRhaWBEX/c= +go.mau.fi/whatsmeow v0.0.0-20220614154415-5718022af87c h1:S2rkz7jqSZYBMSY+imK9Se3f1Yquf6fEoXfBDbnhfGY= +go.mau.fi/whatsmeow v0.0.0-20220614154415-5718022af87c/go.mod h1:iUBgOLNaqShLrR17u0kIiRptIGFH+nbT1tRhaWBEX/c= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 h1:NUzdAbFtCJSXU20AOXgeqaUwg8Ypg4MPYmL+d+rsB5c= golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -82,8 +82,8 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886 h1:eJv7u3ksNXoLbGSKuv2s/SIO4tJVxc/A+MTpzxDgz/Q= -golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -107,5 +107,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.11.1-0.20220531155421-43e9bc0bdd59 h1:7EtWwxS4hvSy4yUkcOnwQsWa42kgc2B2QrVr/5J2v5Q= -maunium.net/go/mautrix v0.11.1-0.20220531155421-43e9bc0bdd59/go.mod h1:CiKpMhAx5QZFHK03jpWb0iKI3sGU8x6+LfsOjDrcO8I= +maunium.net/go/mautrix v0.11.1-0.20220606163838-f8f9fe45cbe1 h1:L9THGsACQXLIusKnIq590Y0Tw2iCUIMLa6vYIyCjrRk= +maunium.net/go/mautrix v0.11.1-0.20220606163838-f8f9fe45cbe1/go.mod h1:CiKpMhAx5QZFHK03jpWb0iKI3sGU8x6+LfsOjDrcO8I= diff --git a/main.go b/main.go index bd74f83..0d4f403 100644 --- a/main.go +++ b/main.go @@ -118,9 +118,9 @@ func (br *WABridge) Init() { store.DeviceProps.Version.Secondary = proto.Uint32(uint32(secondary)) store.DeviceProps.Version.Tertiary = proto.Uint32(uint32(tertiary)) } - platformID, ok := waProto.CompanionProps_CompanionPropsPlatformType_value[strings.ToUpper(br.Config.WhatsApp.BrowserName)] + platformID, ok := waProto.DeviceProps_DevicePropsPlatformType_value[strings.ToUpper(br.Config.WhatsApp.BrowserName)] if ok { - store.DeviceProps.PlatformType = waProto.CompanionProps_CompanionPropsPlatformType(platformID).Enum() + store.DeviceProps.PlatformType = waProto.DeviceProps_DevicePropsPlatformType(platformID).Enum() } }