Skip to content

Commit f0b06fa

Browse files
tulirtulir
committed
Bump version to v0.10.8
1 parent 73266af commit f0b06fa

File tree

7 files changed

+47
-40
lines changed

7 files changed

+47
-40
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v0.10.8 (2024-06-16)
2+
3+
* Added proxying options to config.
4+
* Updated fallback message for live locations and polls to clarify the user
5+
should open the native WhatsApp app.
6+
17
# v0.10.7 (2024-04-16)
28

39
* Changed media download retries to be handled asynchronously instead of

‎config/upgrade.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"maunium.net/go/mautrix/bridge/bridgeconfig"
2525
)
2626

27-
func DoUpgrade(helper *up.Helper) {
27+
func DoUpgrade(helper up.Helper) {
2828
bridgeconfig.Upgrader.DoUpgrade(helper)
2929

3030
helper.Copy(up.Str|up.Null, "analytics", "host")

‎go.mod

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ require (
1212
github.com/rs/zerolog v1.33.0
1313
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
1414
github.com/tidwall/gjson v1.17.1
15-
go.mau.fi/util v0.4.2
15+
go.mau.fi/util v0.5.0
1616
go.mau.fi/webp v0.1.0
1717
go.mau.fi/whatsmeow v0.0.0-20240603101645-64bc969fbe78
18-
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8
19-
golang.org/x/image v0.16.0
20-
golang.org/x/net v0.25.0
18+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
19+
golang.org/x/image v0.17.0
20+
golang.org/x/net v0.26.0
2121
golang.org/x/sync v0.7.0
22-
google.golang.org/protobuf v1.34.1
23-
maunium.net/go/mautrix v0.18.1
22+
google.golang.org/protobuf v1.34.2
23+
maunium.net/go/mautrix v0.19.0-beta.1
2424
)
2525

2626
require (
@@ -39,12 +39,12 @@ require (
3939
github.com/tidwall/match v1.1.1 // indirect
4040
github.com/tidwall/pretty v1.2.0 // indirect
4141
github.com/tidwall/sjson v1.2.5 // indirect
42-
github.com/yuin/goldmark v1.7.1 // indirect
42+
github.com/yuin/goldmark v1.7.2 // indirect
4343
go.mau.fi/libsignal v0.1.0 // indirect
4444
go.mau.fi/zeroconfig v0.1.2 // indirect
45-
golang.org/x/crypto v0.23.0 // indirect
46-
golang.org/x/sys v0.20.0 // indirect
47-
golang.org/x/text v0.15.0 // indirect
45+
golang.org/x/crypto v0.24.0 // indirect
46+
golang.org/x/sys v0.21.0 // indirect
47+
golang.org/x/text v0.16.0 // indirect
4848
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
4949
gopkg.in/yaml.v3 v3.0.1 // indirect
5050
maunium.net/go/mauflag v1.0.0 // indirect

‎go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,37 +65,37 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
6565
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
6666
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
6767
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
68-
github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U=
69-
github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
68+
github.com/yuin/goldmark v1.7.2 h1:NjGd7lO7zrUn/A7eKwn5PEOt4ONYGqpxSEeZuduvgxc=
69+
github.com/yuin/goldmark v1.7.2/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
7070
go.mau.fi/libsignal v0.1.0 h1:vAKI/nJ5tMhdzke4cTK1fb0idJzz1JuEIpmjprueC+c=
7171
go.mau.fi/libsignal v0.1.0/go.mod h1:R8ovrTezxtUNzCQE5PH30StOQWWeBskBsWE55vMfY9I=
72-
go.mau.fi/util v0.4.2 h1:RR3TOcRHmCF9Bx/3YG4S65MYfa+nV6/rn8qBWW4Mi30=
73-
go.mau.fi/util v0.4.2/go.mod h1:PlAVfUUcPyHPrwnvjkJM9UFcPE7qGPDJqk+Oufa1Gtw=
72+
go.mau.fi/util v0.5.0 h1:8yELAl+1CDRrwGe9NUmREgVclSs26Z68pTWePHVxuDo=
73+
go.mau.fi/util v0.5.0/go.mod h1:DsJzUrJAG53lCZnnYvq9/mOyLuPScWwYhvETiTrpdP4=
7474
go.mau.fi/webp v0.1.0 h1:BHObH/DcFntT9KYun5pDr0Ot4eUZO8k2C7eP7vF4ueA=
7575
go.mau.fi/webp v0.1.0/go.mod h1:e42Z+VMFrUMS9cpEwGRIor+lQWO8oUAyPyMtcL+NMt8=
7676
go.mau.fi/whatsmeow v0.0.0-20240603101645-64bc969fbe78 h1:zST/E2cOjQEjXuis0miwSd20Uf+ffdJna6QefQyxEcc=
7777
go.mau.fi/whatsmeow v0.0.0-20240603101645-64bc969fbe78/go.mod h1:0+65CYaE6r4dWzr0dN8i+UZKy0gIfJ79VuSqIl0nKRM=
7878
go.mau.fi/zeroconfig v0.1.2 h1:DKOydWnhPMn65GbXZOafgkPm11BvFashZWLct0dGFto=
7979
go.mau.fi/zeroconfig v0.1.2/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
80-
golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI=
81-
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
82-
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8 h1:ESSUROHIBHg7USnszlcdmjBEwdMj9VUvU+OPk4yl2mc=
83-
golang.org/x/exp v0.0.0-20240409090435-93d18d7e34b8/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
84-
golang.org/x/image v0.16.0 h1:9kloLAKhUufZhA12l5fwnx2NZW39/we1UhBesW433jw=
85-
golang.org/x/image v0.16.0/go.mod h1:ugSZItdV4nOxyqp56HmXwH0Ry0nBCpjnZdpDaIHdoPs=
86-
golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac=
87-
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
80+
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
81+
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
82+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
83+
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
84+
golang.org/x/image v0.17.0 h1:nTRVVdajgB8zCMZVsViyzhnMKPwYeroEERRC64JuLco=
85+
golang.org/x/image v0.17.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
86+
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
87+
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
8888
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
8989
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
9090
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9191
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
9292
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
93-
golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
94-
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
95-
golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
96-
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
97-
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
98-
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
93+
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
94+
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
95+
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
96+
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
97+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
98+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
9999
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
100100
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
101101
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -105,5 +105,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
105105
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
106106
maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
107107
maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
108-
maunium.net/go/mautrix v0.18.1 h1:a6mUsJixegBNTXUoqC5RQ9gsumIPzKvCubKwF+zmCt4=
109-
maunium.net/go/mautrix v0.18.1/go.mod h1:2oHaq792cSXFGvxLvYw3Gf1L4WVVP4KZcYys5HVk/h8=
108+
maunium.net/go/mautrix v0.19.0-beta.1 h1:QGqcafucRwnKv/hPc8stGqUuZYZcHJ4PyCki7shMAXA=
109+
maunium.net/go/mautrix v0.19.0-beta.1/go.mod h1:cxv1w6+syudmEpOewHYIQT9yO7TM5UOWmf6xEBVI4H4=

‎main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ func main() {
257257
Name: "mautrix-whatsapp",
258258
URL: "https://github.com/mautrix/whatsapp",
259259
Description: "A Matrix-WhatsApp puppeting bridge.",
260-
Version: "0.10.7",
260+
Version: "0.10.8",
261261
ProtocolName: "WhatsApp",
262262
BeeperServiceName: "whatsapp",
263263
BeeperNetworkName: "whatsapp",

‎portal.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2185,7 +2185,7 @@ func (portal *Portal) CreateMatrixRoom(ctx context.Context, user *User, groupInf
21852185
initialState = append(initialState, &event.Event{
21862186
Type: event.StateRoomAvatar,
21872187
Content: event.Content{
2188-
Parsed: event.RoomAvatarEventContent{URL: portal.AvatarURL},
2188+
Parsed: event.RoomAvatarEventContent{URL: portal.AvatarURL.CUString()},
21892189
},
21902190
})
21912191
portal.AvatarSet = true
@@ -5476,18 +5476,19 @@ func (portal *Portal) HandleMatrixMeta(brSender bridge.User, evt *event.Event) {
54765476
case *event.RoomAvatarEventContent:
54775477
portal.avatarLock.Lock()
54785478
defer portal.avatarLock.Unlock()
5479-
if content.URL == portal.AvatarURL || (content.URL.IsEmpty() && portal.Avatar == "remove") {
5479+
url := content.URL.ParseOrIgnore()
5480+
if url == portal.AvatarURL || (url.IsEmpty() && portal.Avatar == "remove") {
54805481
return
54815482
}
54825483
var data []byte
54835484
var err error
5484-
if !content.URL.IsEmpty() {
5485-
data, err = portal.MainIntent().DownloadBytes(ctx, content.URL)
5485+
if !url.IsEmpty() {
5486+
data, err = portal.MainIntent().DownloadBytes(ctx, url)
54865487
if err != nil {
5487-
log.Err(err).Stringer("mxc_uri", content.URL).Msg("Failed to download updated avatar")
5488+
log.Err(err).Stringer("mxc_uri", url).Msg("Failed to download updated avatar")
54885489
return
54895490
}
5490-
log.Debug().Stringer("mxc_uri", content.URL).Msg("Updating group avatar")
5491+
log.Debug().Stringer("mxc_uri", url).Msg("Updating group avatar")
54915492
} else {
54925493
log.Debug().Msg("Removing group avatar")
54935494
}
@@ -5498,7 +5499,7 @@ func (portal *Portal) HandleMatrixMeta(brSender bridge.User, evt *event.Event) {
54985499
}
54995500
log.Debug().Str("avatar_id", newID).Msg("Successfully updated group avatar")
55005501
portal.Avatar = newID
5501-
portal.AvatarURL = content.URL
5502+
portal.AvatarURL = url
55025503
default:
55035504
log.Debug().Type("content_type", content).Msg("Ignoring unknown metadata event type")
55045505
return

‎user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ func (user *User) GetSpaceRoom(ctx context.Context) id.RoomID {
447447
Type: event.StateRoomAvatar,
448448
Content: event.Content{
449449
Parsed: &event.RoomAvatarEventContent{
450-
URL: user.bridge.Config.AppService.Bot.ParsedAvatar,
450+
URL: user.bridge.Config.AppService.Bot.ParsedAvatar.CUString(),
451451
},
452452
},
453453
}},

0 commit comments

Comments
 (0)