mirror of
https://github.com/mautrix/whatsapp.git
synced 2026-09-16 15:52:06 -04:00
Compare commits
23 changed files with 154 additions and 429 deletions
8
.github/workflows/go.yml
vendored
8
.github/workflows/go.yml
vendored
|
|
@ -11,14 +11,14 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
go-version: ["1.26", "1.27"]
|
||||
name: Lint ${{ matrix.go-version == '1.27' && '(latest)' || '(old)' }}
|
||||
go-version: ["1.25", "1.26"]
|
||||
name: Lint ${{ matrix.go-version == '1.26' && '(latest)' || '(old)' }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v7
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Set up Go
|
||||
uses: actions/setup-go@v7
|
||||
uses: actions/setup-go@v6
|
||||
with:
|
||||
go-version: ${{ matrix.go-version }}
|
||||
cache: true
|
||||
|
|
|
|||
18
CHANGELOG.md
18
CHANGELOG.md
|
|
@ -1,21 +1,3 @@
|
|||
# v26.09
|
||||
|
||||
* Bumped minimum Go version to 1.26.
|
||||
* Added option to limit eager member sync in group chat portals.
|
||||
* Added option to fetch avatars lazily when using direct media.
|
||||
* Added one-time migration to ensure LID ghost avatars are consistent with the
|
||||
old phone number ghosts.
|
||||
* Fixed the resolve identifier command and API not returning any user info for
|
||||
users who hadn't previously been encountered.
|
||||
* Fixed group portal power levels to always allow poll responses.
|
||||
* Fixed handling history sync events where the phone sends nonsensical
|
||||
timestamps.
|
||||
* Fixed handling edits to HD media captions.
|
||||
* Fixed handling bridging own read receipts from the native apps in channels.
|
||||
* Fixed decrypting messages from the new Muse AI bot
|
||||
* May require resyncing app state using `!wa sync appstate regular_high`.
|
||||
* The message contents aren't supported yet.
|
||||
|
||||
# v26.08
|
||||
|
||||
* Switched direct chats to use LIDs instead of phone numbers.
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
See <https://docs.mau.fi/bridges/general/contributing.html>
|
||||
|
|
@ -18,7 +18,7 @@ var m = mxmain.BridgeMain{
|
|||
Name: "mautrix-whatsapp",
|
||||
URL: "https://github.com/mautrix/whatsapp",
|
||||
Description: "A Matrix-WhatsApp puppeting bridge.",
|
||||
Version: "26.09",
|
||||
Version: "26.08",
|
||||
SemCalVer: true,
|
||||
Connector: &connector.WhatsAppConnector{},
|
||||
}
|
||||
|
|
|
|||
32
go.mod
32
go.mod
|
|
@ -1,8 +1,8 @@
|
|||
module go.mau.fi/mautrix-whatsapp
|
||||
|
||||
go 1.26.0
|
||||
go 1.25.0
|
||||
|
||||
toolchain go1.27.1
|
||||
toolchain go1.26.6
|
||||
|
||||
tool go.mau.fi/util/cmd/maubuild
|
||||
|
||||
|
|
@ -10,15 +10,15 @@ require (
|
|||
github.com/lib/pq v1.12.3
|
||||
github.com/rs/zerolog v1.35.1
|
||||
github.com/tidwall/gjson v1.19.0
|
||||
go.mau.fi/util v0.10.1
|
||||
go.mau.fi/util v0.10.0
|
||||
go.mau.fi/webp v0.3.0
|
||||
go.mau.fi/whatsmeow v0.0.0-20260916100317-2375e1751bbd
|
||||
golang.org/x/image v0.46.0
|
||||
golang.org/x/net v0.59.0
|
||||
golang.org/x/sync v0.23.0
|
||||
go.mau.fi/whatsmeow v0.0.0-20260816113502-fb386f152837
|
||||
golang.org/x/image v0.45.0
|
||||
golang.org/x/net v0.58.0
|
||||
golang.org/x/sync v0.22.0
|
||||
google.golang.org/protobuf v1.36.12
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
maunium.net/go/mautrix v0.31.0
|
||||
maunium.net/go/mautrix v0.30.0
|
||||
)
|
||||
|
||||
require (
|
||||
|
|
@ -31,8 +31,8 @@ require (
|
|||
github.com/kr/pretty v0.3.1 // indirect
|
||||
github.com/mattn/go-colorable v0.1.14 // indirect
|
||||
github.com/mattn/go-isatty v0.0.20 // indirect
|
||||
github.com/mattn/go-sqlite3 v1.14.52 // indirect
|
||||
github.com/petermattis/goid v0.0.0-20260820044319-269ab09b5261 // indirect
|
||||
github.com/mattn/go-sqlite3 v1.14.49 // indirect
|
||||
github.com/petermattis/goid v0.0.0-20260816044145-ed329add6b1b // indirect
|
||||
github.com/rogpeppe/go-internal v1.10.0 // indirect
|
||||
github.com/rs/xid v1.6.0 // indirect
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
|
||||
|
|
@ -40,14 +40,14 @@ require (
|
|||
github.com/tidwall/pretty v1.2.1 // indirect
|
||||
github.com/tidwall/sjson v1.2.5 // indirect
|
||||
github.com/vektah/gqlparser/v2 v2.5.27 // indirect
|
||||
github.com/yuin/goldmark v1.8.6 // indirect
|
||||
github.com/yuin/goldmark v1.8.5 // indirect
|
||||
go.mau.fi/libsignal v0.2.2 // indirect
|
||||
go.mau.fi/zeroconfig v0.2.0 // indirect
|
||||
golang.org/x/crypto v0.57.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba // indirect
|
||||
golang.org/x/mod v0.41.0 // indirect
|
||||
golang.org/x/sys v0.48.0 // indirect
|
||||
golang.org/x/text v0.42.0 // indirect
|
||||
golang.org/x/crypto v0.55.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20260813180055-c1d0aacb2297 // indirect
|
||||
golang.org/x/mod v0.40.0 // indirect
|
||||
golang.org/x/sys v0.47.0 // indirect
|
||||
golang.org/x/text v0.41.0 // indirect
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
||||
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
|
||||
maunium.net/go/mauflag v1.0.0 // indirect
|
||||
|
|
|
|||
64
go.sum
64
go.sum
|
|
@ -13,6 +13,8 @@ github.com/coder/websocket v1.8.15/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6p
|
|||
github.com/coreos/go-systemd/v22 v22.7.0 h1:LAEzFkke61DFROc7zNLX/WA2i5J8gYqe0rSj9KI28KA=
|
||||
github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7Ybq9o0BQhMwD0w=
|
||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/elliotchance/orderedmap/v3 v3.1.0 h1:j4DJ5ObEmMBt/lcwIecKcoRxIQUEnw0L804lXYDt/pg=
|
||||
github.com/elliotchance/orderedmap/v3 v3.1.0/go.mod h1:G+Hc2RwaZvJMcS4JpGCOyViCnGeKf0bTYCGTO4uhjSo=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
|
|
@ -32,11 +34,13 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
|
|||
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
|
||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
||||
github.com/mattn/go-sqlite3 v1.14.52 h1:wVbm2Qnf4OXkqhBTSPuCRZDRnxfbVrrmiCEroVdog8U=
|
||||
github.com/mattn/go-sqlite3 v1.14.52/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w=
|
||||
github.com/petermattis/goid v0.0.0-20260820044319-269ab09b5261 h1:lcWAnrqr2nNfDiArwFNHCE4787Mw2tCdVSOXCru0/0E=
|
||||
github.com/petermattis/goid v0.0.0-20260820044319-269ab09b5261/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
|
||||
github.com/mattn/go-sqlite3 v1.14.49 h1:B8jBHC3xhxZgxztrgruTuLucebnULQnx4W7cF7SAE9w=
|
||||
github.com/mattn/go-sqlite3 v1.14.49/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w=
|
||||
github.com/petermattis/goid v0.0.0-20260816044145-ed329add6b1b h1:sS7HLzwS+dO+gxATgQfeZDEdUZe2pKAB3nGoUwP5zU0=
|
||||
github.com/petermattis/goid v0.0.0-20260816044145-ed329add6b1b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
|
||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||
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/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
|
||||
|
|
@ -48,8 +52,8 @@ github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
|
|||
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
|
||||
github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
|
||||
github.com/stretchr/testify v1.12.0 h1:K6Mr6jO9JICuend/5xzTM03ydSV3vdNRYAdPSukj8uI=
|
||||
github.com/stretchr/testify v1.12.0/go.mod h1:bOYBZb5qJ00vPzWfIqBUZPaxK8jWiXc6d3ErP4Ca9Gw=
|
||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
||||
github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
|
||||
github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
|
||||
|
|
@ -63,35 +67,35 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
|
|||
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
|
||||
github.com/vektah/gqlparser/v2 v2.5.27 h1:RHPD3JOplpk5mP5JGX8RKZkt2/Vwj/PZv0HxTdwFp0s=
|
||||
github.com/vektah/gqlparser/v2 v2.5.27/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
|
||||
github.com/yuin/goldmark v1.8.6 h1:d0VcaP1sx9GkFVkoW+KtggpGi2KZ965i14b0+bDQST4=
|
||||
github.com/yuin/goldmark v1.8.6/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
|
||||
github.com/yuin/goldmark v1.8.5 h1:r6N5afV5qj/5S4UTch8agZHJ8UxNCMwX7WjkkJam2NA=
|
||||
github.com/yuin/goldmark v1.8.5/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
|
||||
go.mau.fi/libsignal v0.2.2 h1:QV+XdzQkm3x3aSG7FcqfGSZuFXz83pRZPBFaPygHbOU=
|
||||
go.mau.fi/libsignal v0.2.2/go.mod h1:CRlIQg2J8uYTfDFvNoO8/KcZjs5cey0vbc6oj/bssY0=
|
||||
go.mau.fi/util v0.10.1 h1:1oSqb4TwzLA0cUDY0aomyBPFKkZ3J5fqCmrXV3VH3GQ=
|
||||
go.mau.fi/util v0.10.1/go.mod h1:40TDo7/ekSeOjgr8KAmX31Yf4zrOF94j83WQB+u5ZPc=
|
||||
go.mau.fi/util v0.10.0 h1:vH9IXZmfBKa96p47HxrVqEPkrj02zDJg3o4EF172+Lk=
|
||||
go.mau.fi/util v0.10.0/go.mod h1:uZwpm9sK4wO2Qqy+t6QoVq29szMsRxWXp9/BkQLG4xk=
|
||||
go.mau.fi/webp v0.3.0 h1:gVHQZtz21Ziwj+CDuklbX9mqpsnDIFKxs/BJyV7iZzA=
|
||||
go.mau.fi/webp v0.3.0/go.mod h1:rlZFTev+dYxhvk+XNBP/5GcTt4gXmzAB4DU0aGUYIQo=
|
||||
go.mau.fi/whatsmeow v0.0.0-20260916100317-2375e1751bbd h1:ZRMG9rK+Vghe4U+xGDGI2hkwJgoPTqf25HWm3nkBM8w=
|
||||
go.mau.fi/whatsmeow v0.0.0-20260916100317-2375e1751bbd/go.mod h1:7G7AeRACrC8Se+01+SQbdOp2J/Ce0DUMGxTKFKfRHW4=
|
||||
go.mau.fi/whatsmeow v0.0.0-20260816113502-fb386f152837 h1:xJ13dqFcK/oPNImltlk7sumI/uiQ9EON/6g/iwpT1Nc=
|
||||
go.mau.fi/whatsmeow v0.0.0-20260816113502-fb386f152837/go.mod h1:UFP0D7aj+biuFejsllcoNiHTQorh0ODFUyG4Txpqfks=
|
||||
go.mau.fi/zeroconfig v0.2.0 h1:e/OGEERqVRRKlgaro7E6bh8xXiKFSXB3eNNIud7FUjU=
|
||||
go.mau.fi/zeroconfig v0.2.0/go.mod h1:J0Vn0prHNOm493oZoQ84kq83ZaNCYZnq+noI1b1eN8w=
|
||||
golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M=
|
||||
golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA=
|
||||
golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba h1:Ck8QetSgk912qxWLMCKxd0in+aiyBQyDSMae6e/xmpU=
|
||||
golang.org/x/exp v0.0.0-20260908205506-85c1c2202aba/go.mod h1:50RgIsmK7OwqzTTeqcSXQW8SswW0o8fRcDxmqGluJ8E=
|
||||
golang.org/x/image v0.46.0 h1:b1+oYj0Jbp6K5MDT4i4/eZpYlk3V8SJhhDKh6LBHAyQ=
|
||||
golang.org/x/image v0.46.0/go.mod h1:3B3W05VGVQyuXucLINLjXKrqISASfi4Xj+iCVkLMwew=
|
||||
golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c=
|
||||
golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o=
|
||||
golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues=
|
||||
golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg=
|
||||
golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk=
|
||||
golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
|
||||
golang.org/x/crypto v0.55.0 h1:+KWHjbgOaAQ66dh/YlkZKHlz9ZUlq61AFirAR9ntP8M=
|
||||
golang.org/x/crypto v0.55.0/go.mod h1:uq0V9dE/fzQuJtbnL+2EhWOE63vo164FY8xqEnV9xis=
|
||||
golang.org/x/exp v0.0.0-20260813180055-c1d0aacb2297 h1:YXnL44eJ77R+ji4/ooy8UsXIhz+lbi2Qgdlc8iRN0gY=
|
||||
golang.org/x/exp v0.0.0-20260813180055-c1d0aacb2297/go.mod h1:Mkmymgv+uMpSQ/XxJ/7GpdrdYoqm3u72jEbpCLiJmNk=
|
||||
golang.org/x/image v0.45.0 h1:FMb1nTbH5H9vF55SriQHgFw5GnNL9Jg6L25BwXKzhB0=
|
||||
golang.org/x/image v0.45.0/go.mod h1:n62x/7RqlwXDvGsSU4u6IUTUf6KghUZ9Bt7cG/T9Fx4=
|
||||
golang.org/x/mod v0.40.0 h1:hUv+3cXcdRHz08UmSiOob7sadHig73uo5bkXxQ/tvUs=
|
||||
golang.org/x/mod v0.40.0/go.mod h1:0/weTWkPWGBikyTWAX3dkjVztMmBA5hM0DH6BElSupE=
|
||||
golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To=
|
||||
golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU=
|
||||
golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
|
||||
golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo=
|
||||
golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
|
||||
golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI=
|
||||
golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E=
|
||||
golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
|
||||
golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||
golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8=
|
||||
golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M=
|
||||
google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=
|
||||
google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
|
|
@ -103,5 +107,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
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/mautrix v0.31.0 h1:x6XNBSa0kOaBgcleI+ZBLkGvBdHIE0qdeY6TZ4wWUeI=
|
||||
maunium.net/go/mautrix v0.31.0/go.mod h1:vfPYtoGAjlTnIF+W8tl+rjX3yB4PEfqYR2sDXvQo4Co=
|
||||
maunium.net/go/mautrix v0.30.0 h1:bad+q7w5tLqiHpr+oUxVI+8m8ePbV3AvoFKg2jQzPyo=
|
||||
maunium.net/go/mautrix v0.30.0/go.mod h1:bb0gjxbTFOqTaAYKGw5E7j9XROUR2Sl1Etm3IbmYXbo=
|
||||
|
|
|
|||
|
|
@ -247,14 +247,12 @@ func (wa *WhatsAppClient) handleWAHistorySync(
|
|||
return c.Stringer("chat_jid", jid)
|
||||
})
|
||||
|
||||
var firstItemTime, lastItemTime time.Time
|
||||
var minTime, maxTime, firstItemTime, lastItemTime time.Time
|
||||
var minTimeIndex, maxTimeIndex int
|
||||
|
||||
ignoredTypes := 0
|
||||
rawMessages := conv.GetMessages()
|
||||
messages := make([]*wadb.HistorySyncMessageTuple, 0, len(rawMessages))
|
||||
allowClamp := conv.GetCommentsCount() == 0
|
||||
var newerTS uint64
|
||||
for i, rawMsg := range rawMessages {
|
||||
messages := make([]*wadb.HistorySyncMessageTuple, 0, len(conv.GetMessages()))
|
||||
for i, rawMsg := range conv.GetMessages() {
|
||||
// Don't store messages that will just be skipped.
|
||||
msgEvt, err := wa.Client.ParseWebMessage(jid, rawMsg.GetMessage())
|
||||
if err != nil {
|
||||
|
|
@ -272,30 +270,20 @@ func (wa *WhatsAppClient) handleWAHistorySync(
|
|||
firstItemTime = msgEvt.Info.Timestamp
|
||||
}
|
||||
lastItemTime = msgEvt.Info.Timestamp
|
||||
if minTime.IsZero() || msgEvt.Info.Timestamp.Before(minTime) {
|
||||
minTime = msgEvt.Info.Timestamp
|
||||
minTimeIndex = i
|
||||
}
|
||||
if maxTime.IsZero() || msgEvt.Info.Timestamp.After(maxTime) {
|
||||
maxTime = msgEvt.Info.Timestamp
|
||||
maxTimeIndex = i
|
||||
}
|
||||
|
||||
msgType := getMessageType(msgEvt.Message)
|
||||
if msgType == "ignore" || strings.HasPrefix(msgType, "unknown_protocol_") {
|
||||
ignoredTypes++
|
||||
continue
|
||||
}
|
||||
// Comments (replies) in announcement groups are not ordered by timestamp, so don't clamp them.
|
||||
if rawMsg.GetMessage().GetCommentMetadata().GetCommentParentKey() != nil {
|
||||
allowClamp = false
|
||||
}
|
||||
// WhatsApp has bugs where some random messages will have timestamps decades in the future.
|
||||
// To ensure they don't mess up our ordering, require timestamps of older messages to be
|
||||
// before the previous (newer) message.
|
||||
if currentTS := rawMsg.GetMessage().GetMessageTimestamp(); newerTS > 0 && allowClamp && currentTS > newerTS {
|
||||
log.Warn().
|
||||
Time("current_ts", time.Unix(int64(currentTS), 0)).
|
||||
Time("prev_ts", time.Unix(int64(newerTS), 0)).
|
||||
Int("msg_index", i).
|
||||
Str("msg_id", rawMsg.GetMessage().GetKey().GetID()).
|
||||
Msg("Clamping message timestamp")
|
||||
rawMsg.Message.MessageTimestamp = ptr.Ptr(newerTS)
|
||||
msgEvt.Info.Timestamp = time.Unix(int64(newerTS), 0)
|
||||
}
|
||||
newerTS = rawMsg.GetMessage().GetMessageTimestamp()
|
||||
marshaled, err := proto.Marshal(rawMsg)
|
||||
if err != nil {
|
||||
log.Warn().Err(err).
|
||||
|
|
@ -310,8 +298,13 @@ func (wa *WhatsAppClient) handleWAHistorySync(
|
|||
log.Debug().
|
||||
Int("wrapped_count", len(messages)).
|
||||
Int("ignored_msg_type_count", ignoredTypes).
|
||||
Time("lowest_time", minTime).
|
||||
Int("lowest_time_index", minTimeIndex).
|
||||
Time("highest_time", maxTime).
|
||||
Int("highest_time_index", maxTimeIndex).
|
||||
Time("first_item_time", firstItemTime).
|
||||
Time("last_item_time", lastItemTime).
|
||||
Bool("highest_time_mismatch", firstItemTime != maxTime).
|
||||
Dict("metadata", zerolog.Dict().
|
||||
Uint32("ephemeral_expiration", conv.GetEphemeralExpiration()).
|
||||
Int64("ephemeral_setting_timestamp", conv.GetEphemeralSettingTimestamp()).
|
||||
|
|
@ -327,7 +320,7 @@ func (wa *WhatsAppClient) handleWAHistorySync(
|
|||
Msg("Collected messages to save from history sync conversation")
|
||||
|
||||
if len(messages) > 0 {
|
||||
err = wa.Main.DB.Conversation.Put(ctx, wadb.NewConversation(wa.UserLogin.ID, jid, conv, firstItemTime))
|
||||
err = wa.Main.DB.Conversation.Put(ctx, wadb.NewConversation(wa.UserLogin.ID, jid, conv, maxTime))
|
||||
if err != nil {
|
||||
if stopOnError {
|
||||
return fmt.Errorf("failed to save conversation metadata for %s: %w", jid, err)
|
||||
|
|
@ -532,7 +525,6 @@ func (wa *WhatsAppClient) FetchMessages(ctx context.Context, params bridgev2.Fet
|
|||
return nil, fmt.Errorf("failed to load messages from database: %w", err)
|
||||
} else if len(messages) == 0 || (len(messages) == 1 && anchorID != "" && messages[0].GetKey().GetID() == anchorID) {
|
||||
wa.deleteHistorySyncMessages(ctx, portalJID, 0, 0)
|
||||
hasMore = hasMore && params.AnchorMessage != nil
|
||||
if hasMore && !params.AllowSlowFetch {
|
||||
return &bridgev2.FetchMessagesResponse{
|
||||
MoreRequiresSlowFetch: true,
|
||||
|
|
@ -602,9 +594,6 @@ func (wa *WhatsAppClient) convertHistorySyncMessages(
|
|||
messages []*waWeb.WebMessageInfo,
|
||||
explodeOnError bool,
|
||||
) (*bridgev2.FetchMessagesResponse, error) {
|
||||
if wa.Client == nil {
|
||||
return nil, bridgev2.ErrNotLoggedIn
|
||||
}
|
||||
oldestTS := messages[len(messages)-1].GetMessageTimestamp()
|
||||
newestTS := messages[0].GetMessageTimestamp()
|
||||
convertedMessages := make([]*bridgev2.BackfillMessage, 0, len(messages))
|
||||
|
|
|
|||
|
|
@ -29,8 +29,6 @@ func (wa *WhatsAppClient) GetChatInfo(ctx context.Context, portal *bridgev2.Port
|
|||
return wa.getChatInfo(ctx, portalJID, nil, portal.MXID == "")
|
||||
}
|
||||
|
||||
var ErrBroadcastList = errors.New("broadcast list bridging is currently not supported")
|
||||
|
||||
func (wa *WhatsAppClient) getChatInfo(ctx context.Context, portalJID types.JID, conv *wadb.Conversation, isNew bool) (wrapped *bridgev2.ChatInfo, err error) {
|
||||
switch portalJID.Server {
|
||||
case types.DefaultUserServer, types.HiddenUserServer, types.BotServer:
|
||||
|
|
@ -39,7 +37,7 @@ func (wa *WhatsAppClient) getChatInfo(ctx context.Context, portalJID types.JID,
|
|||
if portalJID == types.StatusBroadcastJID {
|
||||
wrapped = wa.wrapStatusBroadcastInfo(ctx)
|
||||
} else {
|
||||
return nil, ErrBroadcastList
|
||||
return nil, fmt.Errorf("broadcast list bridging is currently not supported")
|
||||
}
|
||||
case types.GroupServer:
|
||||
info, err := wa.Client.GetGroupInfo(ctx, portalJID)
|
||||
|
|
@ -273,12 +271,11 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn
|
|||
setAddressingMode(info.AddressingMode),
|
||||
setTopicID(info.TopicID, info.Topic),
|
||||
)
|
||||
syncAllMembers := wa.Main.Config.MaxMemberSync < 0 || len(info.Participants) < wa.Main.Config.MaxMemberSync
|
||||
wrapped := &bridgev2.ChatInfo{
|
||||
Name: ptr.Ptr(info.Name),
|
||||
Topic: ptr.Ptr(info.Topic),
|
||||
Members: &bridgev2.ChatMemberList{
|
||||
IsFull: !info.IsIncognito && !info.IsParent && syncAllMembers,
|
||||
IsFull: !info.IsIncognito && !info.IsParent,
|
||||
TotalMemberCount: len(info.Participants),
|
||||
MemberMap: make(map[networkid.UserID]bridgev2.ChatMember, len(info.Participants)),
|
||||
PowerLevels: &bridgev2.PowerLevelOverrides{
|
||||
|
|
@ -287,13 +284,14 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn
|
|||
Ban: ptr.Ptr(nobodyPL),
|
||||
// TODO allow invites if bridge config says to allow them, or maybe if relay mode is enabled?
|
||||
Events: map[event.Type]int{
|
||||
event.StateRoomName: metaChangePL,
|
||||
event.StateRoomAvatar: metaChangePL,
|
||||
event.StateTopic: metaChangePL,
|
||||
event.EventReaction: defaultPL,
|
||||
event.EventRedaction: defaultPL,
|
||||
event.EventUnstablePollResponse: defaultPL,
|
||||
event.StateRoomName: metaChangePL,
|
||||
event.StateRoomAvatar: metaChangePL,
|
||||
event.StateTopic: metaChangePL,
|
||||
event.EventReaction: defaultPL,
|
||||
event.EventRedaction: defaultPL,
|
||||
|
||||
event.StateBeeperDisappearingTimer: metaChangePL,
|
||||
// TODO always allow poll responses
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -318,9 +316,6 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn
|
|||
} else if pcp.IsAdmin {
|
||||
member.PowerLevel = ptr.Ptr(adminPL)
|
||||
} else {
|
||||
if !syncAllMembers && !member.EventSender.IsFromMe {
|
||||
continue
|
||||
}
|
||||
member.PowerLevel = ptr.Ptr(defaultPL)
|
||||
}
|
||||
member.MemberEventExtra = map[string]any{
|
||||
|
|
@ -556,12 +551,12 @@ func (wa *WhatsAppClient) wrapNewsletterInfo(ctx context.Context, info *types.Ne
|
|||
StateDefault: ptr.Ptr(nobodyPL),
|
||||
Ban: ptr.Ptr(nobodyPL),
|
||||
Events: map[event.Type]int{
|
||||
event.StateRoomName: adminPL,
|
||||
event.StateRoomAvatar: adminPL,
|
||||
event.StateTopic: adminPL,
|
||||
event.EventReaction: defaultPL,
|
||||
event.EventRedaction: defaultPL,
|
||||
event.EventUnstablePollResponse: defaultPL,
|
||||
event.StateRoomName: adminPL,
|
||||
event.StateRoomAvatar: adminPL,
|
||||
event.StateTopic: adminPL,
|
||||
event.EventReaction: defaultPL,
|
||||
event.EventRedaction: defaultPL,
|
||||
// TODO always allow poll responses
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@ func (wa *WhatsAppConnector) LoadUserLogin(ctx context.Context, login *bridgev2.
|
|||
w.Client = whatsmeow.NewClient(w.Device, waLog.Zerolog(log))
|
||||
w.Client.AddEventHandlerWithSuccessStatus(w.handleWAEvent)
|
||||
w.Client.SynchronousAck = true
|
||||
w.Client.EnableDecryptedEventBuffer = wa.Bridge.Config.PortalEventBuffer == 0
|
||||
w.Client.EnableDecryptedEventBuffer = bridgev2.PortalEventBuffer == 0
|
||||
w.Client.ManualHistorySyncDownload = true
|
||||
w.Client.SendReportingTokens = true
|
||||
w.Client.AutomaticMessageRerequestFromPhone = true
|
||||
|
|
@ -116,7 +116,6 @@ type WhatsAppClient struct {
|
|||
nextResync time.Time
|
||||
directMediaRetries map[networkid.MessageID]*directMediaRetry
|
||||
directMediaLock sync.Mutex
|
||||
avatarLock exsync.KeyedMutex[types.JID]
|
||||
mediaRetryLock *semaphore.Weighted
|
||||
offlineSyncWaiter atomic.Pointer[chan error]
|
||||
isNewLogin bool
|
||||
|
|
@ -394,10 +393,6 @@ func (wa *WhatsAppClient) LogoutRemote(ctx context.Context) {
|
|||
}
|
||||
wa.Disconnect()
|
||||
wa.Client = nil
|
||||
err := wa.Main.DB.Conversation.DeleteAll(ctx, wa.UserLogin.ID)
|
||||
if err != nil {
|
||||
zerolog.Ctx(ctx).Err(err).Msg("Failed to delete history sync data on logout")
|
||||
}
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) IsLoggedIn() bool {
|
||||
|
|
|
|||
|
|
@ -52,8 +52,6 @@ type Config struct {
|
|||
DirectMediaAutoRequest bool `yaml:"direct_media_auto_request"`
|
||||
InitialAutoReconnect bool `yaml:"initial_auto_reconnect"`
|
||||
UseWhatsAppRetryStore bool `yaml:"use_whatsapp_retry_store"`
|
||||
MaxMemberSync int `yaml:"max_member_sync"`
|
||||
LazyAvatars bool `yaml:"lazy_avatars"`
|
||||
|
||||
AnimatedSticker msgconv.AnimatedStickerConfig `yaml:"animated_sticker"`
|
||||
|
||||
|
|
@ -131,8 +129,6 @@ func upgradeConfig(helper up.Helper) {
|
|||
helper.Copy(up.Bool, "direct_media_auto_request")
|
||||
helper.Copy(up.Bool, "initial_auto_reconnect")
|
||||
helper.Copy(up.Bool, "use_whatsapp_retry_store")
|
||||
helper.Copy(up.Int, "max_member_sync")
|
||||
helper.Copy(up.Bool, "lazy_avatars")
|
||||
|
||||
helper.Copy(up.Str, "animated_sticker", "target")
|
||||
helper.Copy(up.Int, "animated_sticker", "args", "width")
|
||||
|
|
@ -209,7 +205,6 @@ func (wa *WhatsAppConnector) GetConfig() (string, any, up.Upgrader) {
|
|||
{"proxy"},
|
||||
{"displayname_template"},
|
||||
{"call_start_notices"},
|
||||
{"animated_sticker"},
|
||||
{"history_sync"},
|
||||
},
|
||||
Base: ExampleConfig,
|
||||
|
|
|
|||
|
|
@ -142,9 +142,6 @@ func (wa *WhatsAppConnector) Init(bridge *bridgev2.Bridge) {
|
|||
}
|
||||
|
||||
func (wa *WhatsAppConnector) Start(ctx context.Context) error {
|
||||
if !wa.MsgConv.DirectMedia && wa.Config.LazyAvatars {
|
||||
return fmt.Errorf("lazy_avatars set without enabling global direct_media")
|
||||
}
|
||||
err := wa.DeviceStore.Upgrade(ctx)
|
||||
if err != nil {
|
||||
return bridgev2.DBUpgradeError{Err: err, Section: "whatsmeow"}
|
||||
|
|
@ -160,17 +157,7 @@ func (wa *WhatsAppConnector) Start(ctx context.Context) error {
|
|||
return bridgev2.DBUpgradeError{Err: err, Section: "whatsapp"}
|
||||
}
|
||||
|
||||
err = wa.migrateToLIDDMs(ctx)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to migrate to LID DMs: %w", err)
|
||||
}
|
||||
go func() {
|
||||
err = wa.syncMismatchingGhosts(wa.Bridge.BackgroundCtx)
|
||||
if err != nil {
|
||||
wa.Bridge.Log.Err(err).Msg("Failed to sync mismatching ghosts")
|
||||
}
|
||||
}()
|
||||
return nil
|
||||
return wa.migrateToLIDDMs(ctx)
|
||||
}
|
||||
|
||||
func (wa *WhatsAppConnector) Stop() {
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ import (
|
|||
|
||||
"github.com/rs/zerolog"
|
||||
"go.mau.fi/util/exsync"
|
||||
"go.mau.fi/util/jsontime"
|
||||
"go.mau.fi/util/ptr"
|
||||
"go.mau.fi/whatsmeow"
|
||||
"go.mau.fi/whatsmeow/proto/waMmsRetry"
|
||||
|
|
@ -85,15 +84,13 @@ func (wa *WhatsAppConnector) downloadAvatarDirectMedia(ctx context.Context, pars
|
|||
if waClient.Client == nil {
|
||||
return nil, fmt.Errorf("no WhatsApp client found on login %s", parsedID.UserLogin)
|
||||
}
|
||||
waClient.avatarLock.Lock(parsedID.Avatar.TargetJID)
|
||||
defer waClient.avatarLock.Unlock(parsedID.Avatar.TargetJID)
|
||||
cachedInfo, err := wa.DB.AvatarCache.Get(ctx, parsedID.Avatar.TargetJID, parsedID.Avatar.AvatarID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get avatar cache entry: %w", err)
|
||||
}
|
||||
if cachedInfo.IsGone() {
|
||||
if cachedInfo != nil && cachedInfo.Gone {
|
||||
return nil, mautrix.MNotFound.WithMessage("Avatar is no longer available (cached response)")
|
||||
} else if cachedInfo.Expired() {
|
||||
} else if cachedInfo == nil || cachedInfo.Expiry.Time.Before(time.Now().Add(5*time.Minute)) {
|
||||
zerolog.Ctx(ctx).Debug().
|
||||
Str("avatar_id", parsedID.Avatar.AvatarID).
|
||||
Msg("Refreshing avatar URL from WhatsApp servers")
|
||||
|
|
@ -102,7 +99,7 @@ func (wa *WhatsAppConnector) downloadAvatarDirectMedia(ctx context.Context, pars
|
|||
})
|
||||
if errors.Is(err, whatsmeow.ErrProfilePictureNotSet) ||
|
||||
errors.Is(err, whatsmeow.ErrProfilePictureUnauthorized) ||
|
||||
(err == nil && (avatar == nil || (avatar.ID != parsedID.Avatar.AvatarID && !parsedID.Avatar.IsRandom()))) {
|
||||
(err == nil && (avatar == nil || avatar.ID != parsedID.Avatar.AvatarID)) {
|
||||
zerolog.Ctx(ctx).Debug().
|
||||
Err(err).
|
||||
Stringer("target_jid", parsedID.Avatar.TargetJID).
|
||||
|
|
@ -110,14 +107,9 @@ func (wa *WhatsAppConnector) downloadAvatarDirectMedia(ctx context.Context, pars
|
|||
Str("wanted_avatar_id", parsedID.Avatar.AvatarID).
|
||||
Str("got_avatar_id", ptr.Val(avatar).ID).
|
||||
Msg("Avatar is no longer available")
|
||||
var goneExpiry jsontime.Unix
|
||||
if parsedID.Avatar.IsRandom() {
|
||||
goneExpiry = jsontime.U(time.Now().Add(7 * 24 * time.Hour))
|
||||
}
|
||||
err = wa.DB.AvatarCache.Put(ctx, &wadb.AvatarCacheEntry{
|
||||
EntityJID: parsedID.Avatar.TargetJID,
|
||||
AvatarID: parsedID.Avatar.AvatarID,
|
||||
Expiry: goneExpiry,
|
||||
Gone: true,
|
||||
})
|
||||
if err != nil {
|
||||
|
|
@ -136,15 +128,6 @@ func (wa *WhatsAppConnector) downloadAvatarDirectMedia(ctx context.Context, pars
|
|||
Str("avatar_id", avatar.ID).
|
||||
Msg("Failed to update avatar cache entry")
|
||||
}
|
||||
if cachedInfo.AvatarID != parsedID.Avatar.AvatarID {
|
||||
cachedInfo.AvatarID = parsedID.Avatar.AvatarID
|
||||
err = wa.DB.AvatarCache.Put(ctx, cachedInfo)
|
||||
if err != nil {
|
||||
zerolog.Ctx(ctx).Warn().Err(err).
|
||||
Str("avatar_id", parsedID.Avatar.AvatarID).
|
||||
Msg("Failed to update avatar cache entry")
|
||||
}
|
||||
}
|
||||
}
|
||||
return &mediaproxy.GetMediaResponseFile{
|
||||
Callback: func(w *os.File) (*mediaproxy.FileMeta, error) {
|
||||
|
|
@ -272,11 +255,10 @@ func (wa *WhatsAppConnector) makeDirectMediaResponse(
|
|||
|
||||
type directMediaRetry struct {
|
||||
sync.Mutex
|
||||
resultURL string
|
||||
wait *exsync.Event
|
||||
requested bool
|
||||
resultType waMmsRetry.MediaRetryNotification_ResultType
|
||||
decryptFail bool
|
||||
resultURL string
|
||||
wait *exsync.Event
|
||||
requested bool
|
||||
resultType waMmsRetry.MediaRetryNotification_ResultType
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) getDirectMediaRetryState(msgID networkid.MessageID, create bool) *directMediaRetry {
|
||||
|
|
@ -303,9 +285,6 @@ func (wa *WhatsAppClient) requestAndWaitDirectMedia(ctx context.Context, rawMsgI
|
|||
keys.DirectPath = state.resultURL
|
||||
return nil
|
||||
}
|
||||
if state.decryptFail {
|
||||
return mautrix.MNotFound.WithMessage("Unable to retrieve media: failed to decrypt the media retry notification from your phone.")
|
||||
}
|
||||
switch state.resultType {
|
||||
case waMmsRetry.MediaRetryNotification_NOT_FOUND:
|
||||
return mautrix.MNotFound.WithMessage("This media was not found on your phone.")
|
||||
|
|
@ -359,9 +338,6 @@ func (wa *WhatsAppClient) receiveDirectMediaRetry(ctx context.Context, msg *data
|
|||
retryData, err := whatsmeow.DecryptMediaRetryNotification(retry, keys.Key)
|
||||
if err != nil {
|
||||
log.Warn().Err(err).Msg("Failed to decrypt media retry notification")
|
||||
if state != nil {
|
||||
state.decryptFail = true
|
||||
}
|
||||
return
|
||||
}
|
||||
if state != nil {
|
||||
|
|
|
|||
|
|
@ -69,12 +69,6 @@ initial_auto_reconnect: true
|
|||
# the bridge? By default, the bridge only stores messages in memory, and therefore can't accept
|
||||
# retry receipts if the bridge is restarted after the message is sent.
|
||||
use_whatsapp_retry_store: false
|
||||
# Maximum size of groups to sync members eagerly in. Defaults to unlimited.
|
||||
# If set, groups with more than this number of members will not have non-admin participants synced until they talk.
|
||||
max_member_sync: -1
|
||||
# Lazily load avatars using direct media?
|
||||
# Global direct media must be enabled for this.
|
||||
lazy_avatars: false
|
||||
|
||||
# Settings for converting animated stickers.
|
||||
animated_sticker:
|
||||
|
|
|
|||
|
|
@ -24,11 +24,9 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/rs/zerolog"
|
||||
"go.mau.fi/util/exslices"
|
||||
"go.mau.fi/util/ptr"
|
||||
"go.mau.fi/whatsmeow"
|
||||
"go.mau.fi/whatsmeow/appstate"
|
||||
"go.mau.fi/whatsmeow/proto/waCommon"
|
||||
"go.mau.fi/whatsmeow/proto/waE2E"
|
||||
"go.mau.fi/whatsmeow/types"
|
||||
"go.mau.fi/whatsmeow/types/events"
|
||||
|
|
@ -204,7 +202,7 @@ func (wa *WhatsAppClient) handleWAEvent(rawEvt any) (success bool) {
|
|||
wa.UserLogin.BridgeState.Send(status.BridgeState{StateEvent: status.StateConnected})
|
||||
wa.notifyOfflineSyncWaiter(nil)
|
||||
case *events.LoggedOut:
|
||||
wa.handleWALogout(ctx, evt.Reason, evt.OnConnect)
|
||||
wa.handleWALogout(evt.Reason, evt.OnConnect)
|
||||
wa.notifyOfflineSyncWaiter(fmt.Errorf("logged out: %s", evt.Reason))
|
||||
case *events.Disconnected:
|
||||
// Don't send the normal transient disconnect state if we're already in a different transient disconnect state.
|
||||
|
|
@ -284,9 +282,10 @@ func (wa *WhatsAppClient) ensureAltJIDs(ctx context.Context, info *types.Message
|
|||
|
||||
func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Message) (success bool) {
|
||||
success = true
|
||||
if (evt.Info.Chat == types.StatusBroadcastJID && !wa.Main.Config.EnableStatusBroadcast) ||
|
||||
(evt.Info.Chat.Server == types.NewsletterServer && wa.disableNewsletter) ||
|
||||
(evt.Info.Chat.Server == types.BroadcastServer && evt.Info.IsFromMe) {
|
||||
if evt.Info.Chat == types.StatusBroadcastJID && !wa.Main.Config.EnableStatusBroadcast {
|
||||
return
|
||||
}
|
||||
if evt.Info.Chat.Server == types.NewsletterServer && wa.disableNewsletter {
|
||||
return
|
||||
}
|
||||
if !wa.ensureAltJIDs(ctx, &evt.Info.MessageSource, true) {
|
||||
|
|
@ -334,15 +333,7 @@ func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Messa
|
|||
wa.Main.Bridge.Config.Backfill.Enabled {
|
||||
wa.saveWAHistorySyncNotification(ctx, evt.Message.ProtocolMessage.HistorySyncNotification)
|
||||
}
|
||||
if parsedMessageType == "ignore" {
|
||||
return
|
||||
} else if strings.HasPrefix(parsedMessageType, "unknown_protocol_") {
|
||||
wa.UserLogin.Log.Debug().
|
||||
Str("message_id", evt.Info.ID).
|
||||
Stringer("chat_jid", evt.Info.Chat).
|
||||
Stringer("sender_jid", evt.Info.Sender).
|
||||
Stringer("protocol_message_type", evt.Message.GetProtocolMessage().GetType()).
|
||||
Msg("Ignoring unknown protocol message")
|
||||
if parsedMessageType == "ignore" || strings.HasPrefix(parsedMessageType, "unknown_protocol_") {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -350,8 +341,18 @@ func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Messa
|
|||
messageAssoc := evt.Message.GetMessageContextInfo().GetMessageAssociation()
|
||||
if assocType := messageAssoc.GetAssociationType(); assocType == waE2E.MessageAssociation_HD_IMAGE_DUAL_UPLOAD || assocType == waE2E.MessageAssociation_HD_VIDEO_DUAL_UPLOAD {
|
||||
parentKey := messageAssoc.GetParentMessageKey()
|
||||
protocolMsg, shouldHideEdit := makeHDMediaReplacementEdit(evt.Message, parentKey)
|
||||
dontRenderEdited = shouldHideEdit
|
||||
protocolMsg := evt.Message.GetProtocolMessage()
|
||||
if protocolMsg.GetType() != waE2E.ProtocolMessage_MESSAGE_EDIT || protocolMsg.GetKey() == nil {
|
||||
protocolMsg = &waE2E.ProtocolMessage{
|
||||
Type: waE2E.ProtocolMessage_MESSAGE_EDIT.Enum(),
|
||||
Key: parentKey,
|
||||
EditedMessage: evt.Message.GetAssociatedChildMessage().GetMessage(),
|
||||
}
|
||||
dontRenderEdited = true
|
||||
} else if child := protocolMsg.GetEditedMessage().GetAssociatedChildMessage().GetMessage(); child != nil {
|
||||
protocolMsg.EditedMessage = child
|
||||
protocolMsg.Key = parentKey
|
||||
}
|
||||
wa.UserLogin.Log.Debug().
|
||||
Str("message_id", evt.Info.ID).
|
||||
Str("parent_id", parentKey.GetID()).
|
||||
|
|
@ -385,26 +386,6 @@ func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Messa
|
|||
return res.Success
|
||||
}
|
||||
|
||||
func makeHDMediaReplacementEdit(message *waE2E.Message, parentKey *waCommon.MessageKey) (*waE2E.ProtocolMessage, bool) {
|
||||
protocolMsg := message.GetProtocolMessage()
|
||||
associatedMessage := message.GetAssociatedChildMessage().GetMessage()
|
||||
if protocolMsg.GetType() != waE2E.ProtocolMessage_MESSAGE_EDIT || protocolMsg.GetKey() == nil {
|
||||
protocolMsg = associatedMessage.GetProtocolMessage()
|
||||
}
|
||||
if protocolMsg.GetType() == waE2E.ProtocolMessage_MESSAGE_EDIT && protocolMsg.GetKey() != nil {
|
||||
if child := protocolMsg.GetEditedMessage().GetAssociatedChildMessage().GetMessage(); child != nil {
|
||||
protocolMsg.EditedMessage = child
|
||||
}
|
||||
protocolMsg.Key = parentKey
|
||||
return protocolMsg, false
|
||||
}
|
||||
return &waE2E.ProtocolMessage{
|
||||
Type: waE2E.ProtocolMessage_MESSAGE_EDIT.Enum(),
|
||||
Key: parentKey,
|
||||
EditedMessage: associatedMessage,
|
||||
}, true
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) handleWAUndecryptableMessage(ctx context.Context, evt *events.UndecryptableMessage) bool {
|
||||
if !wa.ensureAltJIDs(ctx, &evt.Info.MessageSource, true) {
|
||||
return false
|
||||
|
|
@ -484,8 +465,6 @@ func (wa *WhatsAppClient) handleWAReceipt(ctx context.Context, evt *events.Recei
|
|||
messageSender := wa.GetLID()
|
||||
if !evt.MessageSender.IsEmpty() {
|
||||
messageSender = evt.MessageSender
|
||||
} else if evt.Chat.Server == types.NewsletterServer {
|
||||
messageSender = evt.Chat
|
||||
}
|
||||
var chatAlt types.JID
|
||||
if evt.Chat.Server == types.DefaultUserServer {
|
||||
|
|
@ -504,8 +483,6 @@ func (wa *WhatsAppClient) handleWAReceipt(ctx context.Context, evt *events.Recei
|
|||
senderLID := evt.Sender
|
||||
if senderLID.Server == types.DefaultUserServer && !evt.SenderAlt.IsEmpty() {
|
||||
senderLID = evt.SenderAlt
|
||||
} else if evt.Chat.Server == types.NewsletterServer && evt.Type == types.ReceiptTypeReadSelf {
|
||||
senderLID = wa.GetLID()
|
||||
}
|
||||
res := wa.UserLogin.QueueRemoteEvent(&simplevent.Receipt{
|
||||
EventMeta: simplevent.EventMeta{
|
||||
|
|
@ -513,11 +490,6 @@ func (wa *WhatsAppClient) handleWAReceipt(ctx context.Context, evt *events.Recei
|
|||
PortalKey: wa.makeWAPortalKey(evt.Chat),
|
||||
Sender: wa.makeEventSender(ctx, senderLID),
|
||||
Timestamp: evt.Timestamp,
|
||||
LogContext: func(c zerolog.Context) zerolog.Context {
|
||||
return c.
|
||||
Strs("targets", exslices.CastToString[string](targets)).
|
||||
Stringer("receipt_sender", senderLID)
|
||||
},
|
||||
},
|
||||
Targets: targets,
|
||||
})
|
||||
|
|
@ -556,7 +528,7 @@ func (wa *WhatsAppClient) handleWAChatPresence(ctx context.Context, evt *events.
|
|||
})
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) handleWALogout(ctx context.Context, reason events.ConnectFailureReason, onConnect bool) {
|
||||
func (wa *WhatsAppClient) handleWALogout(reason events.ConnectFailureReason, onConnect bool) {
|
||||
errorCode := WAUnknownLogout
|
||||
if reason == events.ConnectFailureLoggedOut {
|
||||
errorCode = WALoggedOut
|
||||
|
|
@ -568,10 +540,6 @@ func (wa *WhatsAppClient) handleWALogout(ctx context.Context, reason events.Conn
|
|||
wa.JID = types.EmptyJID
|
||||
wa.LID = types.EmptyJID
|
||||
wa.UserLogin.Metadata.(*waid.UserLoginMetadata).WADeviceID = 0
|
||||
err := wa.Main.DB.Conversation.DeleteAll(ctx, wa.UserLogin.ID)
|
||||
if err != nil {
|
||||
zerolog.Ctx(ctx).Err(err).Msg("Failed to delete history sync data on logout")
|
||||
}
|
||||
wa.UserLogin.BridgeState.Send(status.BridgeState{
|
||||
StateEvent: status.StateBadCredentials,
|
||||
Error: errorCode,
|
||||
|
|
@ -736,13 +704,13 @@ func (wa *WhatsAppClient) syncGhost(jid types.JID, reason string, pictureID *str
|
|||
if pictureID != nil && *pictureID != "" && ghost.AvatarID == networkid.AvatarID(*pictureID) {
|
||||
return
|
||||
}
|
||||
userInfo, err := wa.getUserInfo(ctx, jid, ptr.Val(pictureID), pictureID != nil)
|
||||
userInfo, err := wa.getUserInfo(ctx, jid, pictureID != nil)
|
||||
if err != nil {
|
||||
log.Err(err).Msg("Failed to get user info")
|
||||
} else {
|
||||
ghost.UpdateInfo(ctx, userInfo)
|
||||
log.Debug().Msg("Synced ghost info")
|
||||
wa.syncAltGhostWithInfo(ctx, jid, ghost)
|
||||
wa.syncAltGhostWithInfo(ctx, jid, userInfo)
|
||||
}
|
||||
go wa.syncRemoteProfile(ctx, ghost)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -210,60 +210,3 @@ func (wa *WhatsAppConnector) migrateToLIDDMs(ctx context.Context) error {
|
|||
wa.Bridge.DB.KV.Set(ctx, "whatsapp_lid_dms_migrated", "true")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (wa *WhatsAppConnector) syncMismatchingGhosts(ctx context.Context) error {
|
||||
if wa.Bridge.Background || wa.Bridge.DB.KV.Get(ctx, "whatsapp_lid_avatars_resynced") == "true" {
|
||||
return nil
|
||||
}
|
||||
const findMismatchingGhosts = `
|
||||
SELECT id
|
||||
FROM ghost
|
||||
WHERE bridge_id=$1
|
||||
AND id LIKE 'lid-%'
|
||||
AND avatar_mxc=''
|
||||
AND EXISTS (
|
||||
SELECT pnghost.avatar_mxc
|
||||
FROM ghost pnghost
|
||||
WHERE pnghost.bridge_id=$1
|
||||
AND pnghost.id=(SELECT pn FROM whatsmeow_lid_map WHERE lid=replace(ghost.id, 'lid-', ''))
|
||||
AND pnghost.avatar_mxc<>''
|
||||
)
|
||||
`
|
||||
var scanGhostID = dbutil.ConvertRowFn[networkid.UserID](dbutil.ScanSingleColumn[networkid.UserID])
|
||||
ghostIDs, err := scanGhostID.NewRowIter(wa.Bridge.DB.Query(ctx, findMismatchingGhosts, wa.Bridge.ID)).AsList()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get mismatching ghosts: %w", err)
|
||||
}
|
||||
for _, ghostID := range ghostIDs {
|
||||
lid := waid.ParseUserID(ghostID)
|
||||
pn, err := wa.DeviceStore.LIDMap.GetPNForLID(ctx, lid)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get PN for LID %s: %w", lid, err)
|
||||
} else if pn.IsEmpty() {
|
||||
zerolog.Ctx(ctx).Warn().Stringer("lid", lid).Msg("No PN for LID")
|
||||
continue
|
||||
}
|
||||
pnGhost, err := wa.Bridge.GetGhostByID(ctx, waid.MakeUserID(pn))
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get PN ghost for %s: %w", pn, err)
|
||||
}
|
||||
lidGhost, err := wa.Bridge.GetGhostByID(ctx, ghostID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to get LID ghost for %s: %w", ghostID, err)
|
||||
}
|
||||
if lidGhost.AvatarMXC != "" || pnGhost.AvatarMXC == "" {
|
||||
continue
|
||||
}
|
||||
zerolog.Ctx(ctx).Debug().
|
||||
Stringer("pn", pn).
|
||||
Stringer("lid", lid).
|
||||
Str("pn_ghost_avatar", string(pnGhost.AvatarMXC)).
|
||||
Str("lid_ghost_avatar", string(lidGhost.AvatarMXC)).
|
||||
Str("pn_ghost_name", pnGhost.Name).
|
||||
Str("lid_ghost_name", lidGhost.Name).
|
||||
Msg("Updating LID ghost avatar")
|
||||
lidGhost.UpdateInfo(ctx, makeInfoFromGhost(pnGhost))
|
||||
}
|
||||
wa.Bridge.DB.KV.Set(ctx, "whatsapp_lid_avatars_resynced", "true")
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import (
|
|||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
|
|
@ -99,7 +98,6 @@ func (wa *WhatsAppConnector) CreateLogin(_ context.Context, user *bridgev2.User,
|
|||
LoginComplete: exsync.NewEvent(),
|
||||
PasskeyRequest: exsync.NewEvent(),
|
||||
PasskeyConfirmation: exsync.NewEvent(),
|
||||
ADVRotate: exsync.NewEvent(),
|
||||
Received515: exsync.NewEvent(),
|
||||
}, nil
|
||||
}
|
||||
|
|
@ -126,8 +124,6 @@ type WALogin struct {
|
|||
PasskeyConfirmation *exsync.Event
|
||||
PasskeyConfirmationData *events.PairPasskeyConfirmation
|
||||
|
||||
ADVRotate *exsync.Event
|
||||
|
||||
Closed atomic.Bool
|
||||
EventHandlerID uint32
|
||||
}
|
||||
|
|
@ -139,8 +135,7 @@ var (
|
|||
_ bridgev2.LoginProcessWebAuthn = (*WALogin)(nil)
|
||||
)
|
||||
|
||||
const LoginConnectWait = 30 * time.Second
|
||||
const LoginPairPhoneWait = 30 * time.Second
|
||||
const LoginConnectWait = 15 * time.Second
|
||||
|
||||
func (wl *WALogin) Start(ctx context.Context) (*bridgev2.LoginStep, error) {
|
||||
wl.Main.firstClientConnectOnce.Do(wl.Main.onFirstClientConnect)
|
||||
|
|
@ -198,21 +193,19 @@ func (wl *WALogin) StartWithOverride(ctx context.Context, old *bridgev2.UserLogi
|
|||
}
|
||||
|
||||
func (wl *WALogin) SubmitUserInput(ctx context.Context, input map[string]string) (*bridgev2.LoginStep, error) {
|
||||
ctx, cancel := context.WithTimeout(ctx, LoginConnectWait)
|
||||
defer cancel()
|
||||
err := wl.Client.Connect()
|
||||
if err != nil {
|
||||
wl.Log.Err(err).Msg("Failed to connect to WhatsApp for phone code login")
|
||||
return nil, err
|
||||
}
|
||||
connectCtx, cancelConnect := context.WithTimeout(ctx, LoginConnectWait)
|
||||
err = wl.WaitForQRs.Wait(connectCtx)
|
||||
cancelConnect()
|
||||
err = wl.WaitForQRs.Wait(ctx)
|
||||
if err != nil {
|
||||
wl.Log.Warn().Err(err).Msg("Timed out waiting for connection")
|
||||
return nil, fmt.Errorf("failed to wait for connection: %w", err)
|
||||
}
|
||||
pairCtx, cancelPair := context.WithTimeout(ctx, LoginPairPhoneWait)
|
||||
defer cancelPair()
|
||||
pairingCode, err := wl.Client.PairPhone(pairCtx, input["phone_number"], true, whatsmeow.PairClientChrome, "Chrome (Linux)")
|
||||
pairingCode, err := wl.Client.PairPhone(ctx, input["phone_number"], true, whatsmeow.PairClientChrome, "Chrome (Linux)")
|
||||
if err != nil {
|
||||
wl.Log.Err(err).Msg("Failed to request phone code login")
|
||||
if errors.Is(err, whatsmeow.ErrPhoneNumberTooShort) {
|
||||
|
|
@ -274,12 +267,6 @@ func (wl *WALogin) handleEvent(rawEvt any) {
|
|||
wl.StartTime = time.Now()
|
||||
wl.WaitForQRs.Set()
|
||||
return
|
||||
case *events.RotateADVSecret:
|
||||
wl.Log.Debug().Msg("Rotating ADV secret in all QRs")
|
||||
for i, code := range wl.QRs {
|
||||
wl.QRs[i] = strings.Replace(code, evt.OldSecret, evt.NewSecret, 1)
|
||||
}
|
||||
wl.ADVRotate.Set()
|
||||
case *events.QRScannedWithoutMultidevice:
|
||||
wl.Log.Error().Msg("QR code scanned without multidevice enabled")
|
||||
wl.LoginError = ErrLoginMultideviceNotEnabled
|
||||
|
|
@ -342,7 +329,6 @@ func (wl *WALogin) Wait(ctx context.Context) (*bridgev2.LoginStep, error) {
|
|||
Int("current_index", currentIndex)
|
||||
if currentIndex > prevIndex {
|
||||
logEvt.Msg("Returning new QR immediately")
|
||||
wl.ADVRotate.Clear()
|
||||
wl.PrevQRIndex.Store(int32(currentIndex))
|
||||
return makeQRStep(wl.QRs[currentIndex]), nil
|
||||
}
|
||||
|
|
@ -354,7 +340,6 @@ func (wl *WALogin) Wait(ctx context.Context) (*bridgev2.LoginStep, error) {
|
|||
wl.Cancel()
|
||||
return nil, ErrLoginTimeout
|
||||
}
|
||||
wl.ADVRotate.Clear()
|
||||
wl.PrevQRIndex.Store(int32(nextIndex))
|
||||
return makeQRStep(wl.QRs[nextIndex]), nil
|
||||
case <-ctx.Done():
|
||||
|
|
@ -362,10 +347,6 @@ func (wl *WALogin) Wait(ctx context.Context) (*bridgev2.LoginStep, error) {
|
|||
return nil, ctx.Err()
|
||||
case <-wl.PasskeyRequest.GetChan():
|
||||
return wl.makePasskeyStep()
|
||||
case <-wl.ADVRotate.GetChan():
|
||||
wl.Log.Debug().Msg("ADV secret was rotated, returning new QR immediately")
|
||||
wl.ADVRotate.Clear()
|
||||
return makeQRStep(wl.QRs[nextIndex]), nil
|
||||
case <-wl.LoginComplete.GetChan():
|
||||
// continue
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,12 +64,12 @@ func looksEmaily(str string) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
type isOnWhatsappCacheEntry struct {
|
||||
type cacheEntry struct {
|
||||
jid types.JID
|
||||
ts time.Time
|
||||
}
|
||||
|
||||
var isOnWhatsappCache = exsync.NewMap[string, isOnWhatsappCacheEntry]()
|
||||
var isOnWhatsappCache = exsync.NewMap[string, cacheEntry]()
|
||||
|
||||
func (wa *WhatsAppClient) validateIdentifer(ctx context.Context, number string) (types.JID, error) {
|
||||
if strings.HasSuffix(number, "@"+types.BotServer) || strings.HasSuffix(number, "@"+types.HiddenUserServer) {
|
||||
|
|
@ -94,7 +94,7 @@ func (wa *WhatsAppClient) validateIdentifer(ctx context.Context, number string)
|
|||
} else if !resp[0].IsIn {
|
||||
return types.EmptyJID, bridgev2.WrapRespErr(fmt.Errorf("the server said +%s is not on WhatsApp", resp[0].JID.User), mautrix.MNotFound)
|
||||
} else {
|
||||
isOnWhatsappCache.Set(number, isOnWhatsappCacheEntry{resp[0].JID, time.Now()})
|
||||
isOnWhatsappCache.Set(number, cacheEntry{resp[0].JID, time.Now()})
|
||||
return resp[0].JID, nil
|
||||
}
|
||||
}
|
||||
|
|
@ -176,16 +176,11 @@ func (wa *WhatsAppClient) ResolveIdentifier(ctx context.Context, identifier stri
|
|||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get ghost: %w", err)
|
||||
}
|
||||
userInfo, err := wa.getUserInfo(ctx, jid, "", false)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to get user info: %w", err)
|
||||
}
|
||||
|
||||
return &bridgev2.ResolveIdentifierResponse{
|
||||
Ghost: ghost,
|
||||
UserID: waid.MakeUserID(jid),
|
||||
UserInfo: userInfo,
|
||||
Chat: wa.makeCreateChatResponse(ctx, jid, origJID),
|
||||
Ghost: ghost,
|
||||
UserID: waid.MakeUserID(jid),
|
||||
Chat: wa.makeCreateChatResponse(ctx, jid, origJID),
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
@ -243,7 +238,7 @@ func (wa *WhatsAppClient) getContactList(ctx context.Context, filter string, onl
|
|||
resp = append(resp, &bridgev2.ResolveIdentifierResponse{
|
||||
Ghost: ghost,
|
||||
UserID: waid.MakeUserID(jid),
|
||||
UserInfo: wa.contactToUserInfo(ctx, jid, contactInfo, "", false),
|
||||
UserInfo: wa.contactToUserInfo(ctx, jid, contactInfo, false),
|
||||
Chat: chatResp,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -165,13 +165,13 @@ func (wa *WhatsAppClient) doGhostResync(ctx context.Context, queue map[types.JID
|
|||
log.Warn().Stringer("jid", jid).Msg("Didn't get info for puppet in background sync")
|
||||
continue
|
||||
}
|
||||
userInfo, err := wa.getUserInfo(ctx, jid, info.PictureID, info.PictureID != "" && string(ghost.AvatarID) != info.PictureID)
|
||||
userInfo, err := wa.getUserInfo(ctx, jid, info.PictureID != "" && string(ghost.AvatarID) != info.PictureID)
|
||||
if err != nil {
|
||||
log.Err(err).Stringer("jid", jid).Msg("Failed to get user info for puppet in background sync")
|
||||
continue
|
||||
}
|
||||
ghost.UpdateInfo(ctx, userInfo)
|
||||
wa.syncAltGhostWithInfo(ctx, jid, ghost)
|
||||
wa.syncAltGhostWithInfo(ctx, jid, userInfo)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -181,18 +181,18 @@ func (wa *WhatsAppClient) GetUserInfo(ctx context.Context, ghost *bridgev2.Ghost
|
|||
return nil, nil
|
||||
}
|
||||
jid := waid.ParseUserID(ghost.ID)
|
||||
return wa.getUserInfo(ctx, jid, "", ghost.AvatarID == "")
|
||||
return wa.getUserInfo(ctx, jid, ghost.AvatarID == "")
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) getUserInfo(ctx context.Context, jid types.JID, avatarID string, fetchAvatar bool) (*bridgev2.UserInfo, error) {
|
||||
func (wa *WhatsAppClient) getUserInfo(ctx context.Context, jid types.JID, fetchAvatar bool) (*bridgev2.UserInfo, error) {
|
||||
contact, err := wa.GetStore().Contacts.GetContact(ctx, jid)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return wa.contactToUserInfo(ctx, jid, contact, avatarID, fetchAvatar), nil
|
||||
return wa.contactToUserInfo(ctx, jid, contact, fetchAvatar), nil
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) contactToUserInfo(ctx context.Context, jid types.JID, contact types.ContactInfo, avatarID string, fetchAvatar bool) *bridgev2.UserInfo {
|
||||
func (wa *WhatsAppClient) contactToUserInfo(ctx context.Context, jid types.JID, contact types.ContactInfo, getAvatar bool) *bridgev2.UserInfo {
|
||||
if jid == types.MetaAIJID && contact.PushName == jid.User {
|
||||
contact.PushName = "Meta AI"
|
||||
} else if jid == types.LegacyPSAJID || jid == types.PSAJID {
|
||||
|
|
@ -270,9 +270,7 @@ func (wa *WhatsAppClient) contactToUserInfo(ctx context.Context, jid types.JID,
|
|||
} else if phone != "" {
|
||||
ui.Identifiers = []string{fmt.Sprintf("tel:%s", phone)}
|
||||
}
|
||||
if wa.Main.Config.LazyAvatars {
|
||||
ui.ExtraUpdates = bridgev2.MergeExtraUpdaters(ui.ExtraUpdates, wa.makeLazyGhostAvatarUpdater(avatarID, fetchAvatar))
|
||||
} else if fetchAvatar {
|
||||
if getAvatar {
|
||||
ui.ExtraUpdates = bridgev2.MergeExtraUpdaters(ui.ExtraUpdates, wa.fetchGhostAvatar)
|
||||
}
|
||||
return ui
|
||||
|
|
@ -309,21 +307,6 @@ func avatarInfoToCacheEntry(ctx context.Context, jid types.JID, avatar *types.Pr
|
|||
}
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) makeLazyDirectMediaAvatar(ctx context.Context, jid types.JID, avatarID string, community bool) (*bridgev2.Avatar, error) {
|
||||
if avatarID == "" {
|
||||
avatarID = waid.MakeRandomAvatarID()
|
||||
}
|
||||
mxc, err := wa.Main.Bridge.Matrix.GenerateContentURI(ctx, waid.MakeAvatarMediaID(jid, avatarID, wa.UserLogin.ID, community))
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to generate MXC URI: %w", err)
|
||||
}
|
||||
return &bridgev2.Avatar{
|
||||
ID: networkid.AvatarID(avatarID),
|
||||
MXC: mxc,
|
||||
Hash: sha256.Sum256([]byte(avatarID)),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) makeDirectMediaAvatar(ctx context.Context, jid types.JID, avatar *types.ProfilePictureInfo, community bool) (*bridgev2.Avatar, error) {
|
||||
mxc, err := wa.Main.Bridge.Matrix.GenerateContentURI(ctx, waid.MakeAvatarMediaID(jid, avatar.ID, wa.UserLogin.ID, community))
|
||||
if err != nil {
|
||||
|
|
@ -345,21 +328,6 @@ func (wa *WhatsAppClient) makeDirectMediaAvatar(ctx context.Context, jid types.J
|
|||
}, nil
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) makeLazyGhostAvatarUpdater(avatarID string, forceUpdate bool) func(context.Context, *bridgev2.Ghost) bool {
|
||||
return func(ctx context.Context, ghost *bridgev2.Ghost) bool {
|
||||
if ghost.AvatarID != "" && (networkid.AvatarID(avatarID) == ghost.AvatarID || (!forceUpdate && avatarID == "")) {
|
||||
return false
|
||||
}
|
||||
jid := waid.ParseUserID(ghost.ID)
|
||||
wrappedAvatar, err := wa.makeLazyDirectMediaAvatar(ctx, jid, avatarID, false)
|
||||
if err != nil {
|
||||
zerolog.Ctx(ctx).Err(err).Msg("Failed to prepare lazy direct media avatar")
|
||||
return false
|
||||
}
|
||||
return ghost.UpdateAvatar(ctx, wrappedAvatar)
|
||||
}
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) fetchGhostAvatar(ctx context.Context, ghost *bridgev2.Ghost) bool {
|
||||
jid := waid.ParseUserID(ghost.ID)
|
||||
existingID := string(ghost.AvatarID)
|
||||
|
|
@ -431,14 +399,14 @@ func (wa *WhatsAppClient) resyncContacts(forceAvatarSync, automatic bool) {
|
|||
} else if contact, err := contactStore.GetContact(ctx, jid); err != nil {
|
||||
log.Err(err).Stringer("jid", jid).Msg("Failed to get contact info")
|
||||
} else {
|
||||
userInfo := wa.contactToUserInfo(ctx, jid, contact, "", forceAvatarSync || ghost.AvatarID == "")
|
||||
userInfo := wa.contactToUserInfo(ctx, jid, contact, forceAvatarSync || ghost.AvatarID == "")
|
||||
ghost.UpdateInfo(ctx, userInfo)
|
||||
wa.syncAltGhostWithInfo(ctx, jid, ghost)
|
||||
wa.syncAltGhostWithInfo(ctx, jid, userInfo)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (wa *WhatsAppClient) syncAltGhostWithInfo(ctx context.Context, jid types.JID, mainGhost *bridgev2.Ghost) {
|
||||
func (wa *WhatsAppClient) syncAltGhostWithInfo(ctx context.Context, jid types.JID, info *bridgev2.UserInfo) {
|
||||
log := zerolog.Ctx(ctx)
|
||||
var altJID types.JID
|
||||
var err error
|
||||
|
|
@ -463,25 +431,10 @@ func (wa *WhatsAppClient) syncAltGhostWithInfo(ctx context.Context, jid types.JI
|
|||
Msg("Failed to get ghost for alternate JID")
|
||||
return
|
||||
}
|
||||
ghost.UpdateInfo(ctx, makeInfoFromGhost(mainGhost))
|
||||
ghost.UpdateInfo(ctx, info)
|
||||
log.Debug().
|
||||
Stringer("jid", jid).
|
||||
Stringer("alternate_jid", altJID).
|
||||
Msg("Synced alternate ghost with info")
|
||||
go wa.syncRemoteProfile(ctx, ghost)
|
||||
}
|
||||
|
||||
func makeInfoFromGhost(ghost *bridgev2.Ghost) *bridgev2.UserInfo {
|
||||
return &bridgev2.UserInfo{
|
||||
Identifiers: ghost.Identifiers,
|
||||
Name: &ghost.Name,
|
||||
Avatar: &bridgev2.Avatar{
|
||||
ID: ghost.AvatarID,
|
||||
Remove: ghost.AvatarID == "" || ghost.AvatarMXC == "",
|
||||
MXC: ghost.AvatarMXC,
|
||||
Hash: ghost.AvatarHash,
|
||||
},
|
||||
IsBot: &ghost.IsBot,
|
||||
ExtraProfile: ghost.ExtraProfile,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,14 +2,10 @@ package wadb
|
|||
|
||||
import (
|
||||
"context"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"go.mau.fi/util/dbutil"
|
||||
"go.mau.fi/util/jsontime"
|
||||
"go.mau.fi/whatsmeow/types"
|
||||
|
||||
"go.mau.fi/mautrix-whatsapp/pkg/waid"
|
||||
)
|
||||
|
||||
type AvatarCacheQuery struct {
|
||||
|
|
@ -53,13 +49,3 @@ func (ace *AvatarCacheEntry) Scan(row dbutil.Scannable) (*AvatarCacheEntry, erro
|
|||
func (ace *AvatarCacheEntry) sqlVariables() []any {
|
||||
return []any{ace.EntityJID, ace.AvatarID, ace.DirectPath, ace.Expiry, ace.Gone}
|
||||
}
|
||||
|
||||
func (ace *AvatarCacheEntry) IsGone() bool {
|
||||
return ace != nil && ace.Gone &&
|
||||
// Random IDs can be retried after a specific expiry time, other types of gones can't
|
||||
(ace.Expiry.IsZero() || !strings.HasPrefix(ace.AvatarID, waid.RandomAvatarIDPrefix) || ace.Expiry.After(time.Now()))
|
||||
}
|
||||
|
||||
func (ace *AvatarCacheEntry) Expired() bool {
|
||||
return ace == nil || ace.Expiry.Before(time.Now().Add(5*time.Minute))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ func (mc *MessageConverter) ToMatrix(
|
|||
case waMsg.KeepInChatMessage != nil:
|
||||
part, contextInfo = mc.convertKeepInChatMessage(ctx, waMsg.KeepInChatMessage)
|
||||
case waMsg.RichResponseMessage != nil:
|
||||
part, contextInfo = mc.convertRichResponseMessage(ctx, waMsg.RichResponseMessage, waMsg)
|
||||
part, contextInfo = mc.convertRichResponseMessage(ctx, waMsg.RichResponseMessage)
|
||||
case waMsg.ImageMessage != nil:
|
||||
part, contextInfo = mc.convertMediaMessage(ctx, waMsg.ImageMessage, "photo", info, isViewOnce, previouslyConvertedPart)
|
||||
case waMsg.StickerMessage != nil:
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ func (mc *MessageConverter) convertKeepInChatMessage(ctx context.Context, msg *w
|
|||
}, nil
|
||||
}
|
||||
|
||||
func (mc *MessageConverter) convertRichResponseMessage(ctx context.Context, msg *waE2E.AIRichResponseMessage, fullMsg *waE2E.Message) (*bridgev2.ConvertedMessagePart, *waE2E.ContextInfo) {
|
||||
func (mc *MessageConverter) convertRichResponseMessage(ctx context.Context, msg *waE2E.AIRichResponseMessage) (*bridgev2.ConvertedMessagePart, *waE2E.ContextInfo) {
|
||||
var body strings.Builder
|
||||
|
||||
// TODO switch to new format?
|
||||
|
|
@ -363,14 +363,10 @@ func (mc *MessageConverter) convertRichResponseMessage(ctx context.Context, msg
|
|||
body.WriteString(submsg.GetMessageText())
|
||||
}
|
||||
}
|
||||
unknownPart, _ := mc.convertUnknownMessage(ctx, fullMsg)
|
||||
if body.Len() == 0 {
|
||||
return unknownPart, msg.GetContextInfo()
|
||||
}
|
||||
|
||||
content := format.RenderMarkdown(body.String(), true, false)
|
||||
return &bridgev2.ConvertedMessagePart{
|
||||
Type: event.EventMessage,
|
||||
Content: &content,
|
||||
Extra: unknownPart.Extra,
|
||||
}, msg.GetContextInfo()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,12 +37,12 @@ type UserLoginMetadata struct {
|
|||
PushKeys *PushKeys `json:"push_keys,omitempty"`
|
||||
APNSEncPubKey []byte `json:"apns_enc_pubkey,omitempty"`
|
||||
APNSEncPrivKey []byte `json:"apns_enc_privkey,omitempty"`
|
||||
LoggedInAt jsontime.Unix `json:"logged_in_at,omitzero"`
|
||||
LoggedInAt jsontime.Unix `json:"logged_in_at,omitempty"`
|
||||
|
||||
AppStateRecoveryAttempted map[appstate.WAPatchName]time.Time `json:"app_state_recovery_attempted,omitempty"`
|
||||
|
||||
HistorySyncPortalsNeedCreating bool `json:"history_sync_portals_need_creating,omitzero"`
|
||||
ReachoutTimelockUntil time.Time `json:"reachout_timelock_until,omitzero"`
|
||||
HistorySyncPortalsNeedCreating bool `json:"history_sync_portals_need_creating,omitempty"`
|
||||
ReachoutTimelockUntil time.Time `json:"reachout_timelock_until,omitempty"`
|
||||
|
||||
MData json.RawMessage `json:"mdata,omitempty"`
|
||||
}
|
||||
|
|
@ -88,13 +88,13 @@ type GroupInviteMeta struct {
|
|||
}
|
||||
|
||||
type MessageMetadata struct {
|
||||
SenderDeviceID uint16 `json:"sender_device_id,omitzero"`
|
||||
SenderDeviceID uint16 `json:"sender_device_id,omitempty"`
|
||||
Error MessageErrorType `json:"error,omitempty"`
|
||||
BroadcastListJID *types.JID `json:"broadcast_list_jid,omitempty"`
|
||||
GroupInvite *GroupInviteMeta `json:"group_invite,omitempty"`
|
||||
FailedMediaMeta json.RawMessage `json:"media_meta,omitempty"`
|
||||
DirectMediaMeta json.RawMessage `json:"direct_media_meta,omitempty"`
|
||||
IsMatrixPoll bool `json:"is_matrix_poll,omitzero"`
|
||||
IsMatrixPoll bool `json:"is_matrix_poll,omitempty"`
|
||||
Edits []types.MessageID `json:"edits,omitempty"`
|
||||
}
|
||||
|
||||
|
|
@ -122,16 +122,14 @@ type ReactionMetadata struct {
|
|||
}
|
||||
|
||||
type PortalMetadata struct {
|
||||
DisappearingTimerSetAt int64 `json:"disappearing_timer_set_at,omitzero"`
|
||||
DisappearingTimerSetAt int64 `json:"disappearing_timer_set_at,omitempty"`
|
||||
TopicID string `json:"topic_id,omitempty"`
|
||||
LastSync jsontime.Unix `json:"last_sync,omitzero"`
|
||||
CommunityAnnouncementGroup bool `json:"is_cag,omitzero"`
|
||||
LastSync jsontime.Unix `json:"last_sync,omitempty"`
|
||||
CommunityAnnouncementGroup bool `json:"is_cag,omitempty"`
|
||||
AddressingMode types.AddressingMode `json:"addressing_mode,omitempty"`
|
||||
LIDMigrationAttempted bool `json:"lid_migration_attempted,omitzero"`
|
||||
LIDMigrationAttempted bool `json:"lid_migration_attempted,omitempty"`
|
||||
}
|
||||
|
||||
type GhostMetadata struct {
|
||||
LastSync jsontime.Unix `json:"last_sync,omitzero"`
|
||||
|
||||
DirectAvatarURL string `json:"direct_avatar_url,omitempty"`
|
||||
LastSync jsontime.Unix `json:"last_sync,omitempty"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import (
|
|||
"strconv"
|
||||
"strings"
|
||||
|
||||
"go.mau.fi/util/random"
|
||||
"go.mau.fi/whatsmeow/types"
|
||||
"maunium.net/go/mautrix/bridgev2/networkid"
|
||||
)
|
||||
|
|
@ -86,16 +85,6 @@ type AvatarMediaInfo struct {
|
|||
Community bool
|
||||
}
|
||||
|
||||
const RandomAvatarIDPrefix = "mxwa-lazy-avatar-"
|
||||
|
||||
func MakeRandomAvatarID() string {
|
||||
return RandomAvatarIDPrefix + random.String(8)
|
||||
}
|
||||
|
||||
func (ami *AvatarMediaInfo) IsRandom() bool {
|
||||
return ami != nil && strings.HasPrefix(ami.AvatarID, RandomAvatarIDPrefix)
|
||||
}
|
||||
|
||||
func MakeStickerPackMediaID(packID string, fileHash []byte, receiver networkid.UserLoginID) networkid.MediaID {
|
||||
receiverID := compactJID(ParseUserLoginID(receiver, 0))
|
||||
mediaID := make([]byte, 0, 4+len(packID)+len(fileHash)+len(receiverID))
|
||||
|
|
|
|||
Loading…
Reference in a new issue