.bridgelint.yaml

@@ -1 +0,0 @@
-code_format_allowlist: ["wa-connect-failure-%d"]

.github/workflows/go.yml

@@ -11,14 +11,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ["1.26", "1.27"]
+        go-version: ["1.25", "1.26"]
-    name: Lint ${{ matrix.go-version == '1.27' && '(latest)' || '(old)' }}
+    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
@@ -30,7 +30,6 @@ jobs:
         run: |
           go install golang.org/x/tools/cmd/goimports@latest
           go install honnef.co/go/tools/cmd/staticcheck@latest
-          go install github.com/beeper/pre-commit-go/bridgelint@latest
           export PATH="$HOME/go/bin:$PATH"
 
       - name: Run pre-commit

.pre-commit-config.yaml

@@ -21,12 +21,9 @@ repos:
       - id: go-mod-tidy
 
   - repo: https://github.com/beeper/pre-commit-go
-    rev: v0.5.0
+    rev: v0.4.2
     hooks:
       - id: zerolog-ban-msgf
       - id: zerolog-use-stringer
       - id: prevent-literal-http-methods
       - id: zerolog-ban-global-log
-      - id: bridgelint
-        language: system
-        verbose: true

CHANGELOG.md

@@ -1,50 +1,3 @@
-# v26.10
-
-* Added support for new rich response messages used by the Muse AI bot.
-* Added support for bridging custom profile set for Muse.
-* Added automatic one-time resync of keys needed to decrypt Muse messages.
-* Added support for blocking and unblocking users on WhatsApp.
-* Added support for contact array messages (thanks to [@voska] in [#961]).
-* Added partial support for filling quoted message when sending replies to
-  WhatsApp.
-* Changed undecryptable message resends to only bridge as edits and never as new
-  messages, to avoid races if the message was deleted before the resend.
-* Changed login to wait for OTKs to be successfully uploaded, as the login will
-  fail if the bridge is stopped before that point.
-* Changed chat info syncing to not bridge mute status if app state sync is
-  failing.
-* Changed power levels to allow poll votes in read-only groups even if the room
-  is encrypted.
-* Fixed backfilled media retries not getting sent if configured for local time.
-* Fixed "delete for me" from WhatsApp not being bridged correctly in DMs.
-* Fixed very long WhatsApp messages not being bridged.
-* Fixed document message caption edits not being handled correctly.
-
-[@voska]: https://github.com/voska
-[#961]: https://github.com/mautrix/whatsapp/pull/961
-
-# 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.
-
 # v26.07
 
 * Updated Docker image to Alpine 3.24.

CONTRIBUTING.md

@@ -1 +0,0 @@
-See <https://docs.mau.fi/bridges/general/contributing.html>

cmd/mautrix-whatsapp/main.go

@@ -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.10",
+	Version:     "26.07",
 	SemCalVer:   true,
 	Connector:   &connector.WhatsAppConnector{},
 }

go.mod

@@ -1,26 +1,24 @@
 module go.mau.fi/mautrix-whatsapp
 
-go 1.26.0
+go 1.25.0
 
-toolchain go1.27.2
+toolchain go1.26.5
 
 tool go.mau.fi/util/cmd/maubuild
 
 require (
-	github.com/google/uuid v1.6.0
 	github.com/lib/pq v1.12.3
 	github.com/rs/zerolog v1.35.1
-	github.com/tidwall/gjson v1.20.0
+	github.com/tidwall/gjson v1.19.0
-	github.com/yuin/goldmark v1.8.6
+	go.mau.fi/util v0.9.12-0.20260719092501-f9c03d846391
-	go.mau.fi/util v0.11.0
 	go.mau.fi/webp v0.3.0
-	go.mau.fi/whatsmeow v0.0.0-20261026125351-1fbae988179a
+	go.mau.fi/whatsmeow v0.0.0-20260805124304-6723e556f35a
-	golang.org/x/image v0.47.0
+	golang.org/x/image v0.44.0
-	golang.org/x/net v0.61.0
+	golang.org/x/net v0.57.0
-	golang.org/x/sync v0.24.0
+	golang.org/x/sync v0.22.0
-	google.golang.org/protobuf v1.36.12
+	google.golang.org/protobuf v1.36.11
 	gopkg.in/yaml.v3 v3.0.1
-	maunium.net/go/mautrix v0.32.1-0.20261105141340-842796acf445
+	maunium.net/go/mautrix v0.29.1-0.20260804113340-56938b8a508d
 )
 
 require (
@@ -29,11 +27,12 @@ require (
 	github.com/coder/websocket v1.8.15 // indirect
 	github.com/coreos/go-systemd/v22 v22.7.0 // indirect
 	github.com/elliotchance/orderedmap/v3 v3.1.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	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/mattn/go-sqlite3 v1.14.48 // indirect
-	github.com/petermattis/goid v0.0.0-20260918085751-abfca077860b // indirect
+	github.com/petermattis/goid v0.0.0-20260713124913-97594f28f5ca // 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
@@ -41,13 +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.4 // indirect
 	go.mau.fi/libsignal v0.2.2 // indirect
 	go.mau.fi/zeroconfig v0.2.0 // indirect
-	golang.org/x/crypto v0.58.0 // indirect
+	golang.org/x/crypto v0.54.0 // indirect
-	golang.org/x/exp v0.0.0-20261014143641-f0251eb4aa3e // indirect
+	golang.org/x/exp v0.0.0-20260709172345-9ea1abe57597 // indirect
-	golang.org/x/mod v0.42.0 // indirect
+	golang.org/x/mod v0.38.0 // indirect
-	golang.org/x/sys v0.49.0 // indirect
+	golang.org/x/sys v0.47.0 // indirect
-	golang.org/x/text v0.43.0 // indirect
+	golang.org/x/text v0.40.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

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.48 h1:7XHIgl0a8HwOaiK4E47ozLkST78rR9+OtNGx27D/TFs=
-github.com/mattn/go-sqlite3 v1.14.52/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w=
+github.com/mattn/go-sqlite3 v1.14.48/go.mod h1:6JTjA44L93a0QCyJef5YvlPoKXntQPjzWv5gtm9sB6w=
-github.com/petermattis/goid v0.0.0-20260918085751-abfca077860b h1:OzNsuVdSWGwXvWKTtChx9ve89k4cFJ6NxYM4Aw4/f+E=
+github.com/petermattis/goid v0.0.0-20260713124913-97594f28f5ca h1:GHSUVE4yOgX4E7kTRzpxCPbCOYkd3Kj8Dgdod30OI1E=
-github.com/petermattis/goid v0.0.0-20260918085751-abfca077860b/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/petermattis/goid v0.0.0-20260713124913-97594f28f5ca/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,11 +52,11 @@ 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.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.12.0/go.mod h1:bOYBZb5qJ00vPzWfIqBUZPaxK8jWiXc6d3ErP4Ca9Gw=
+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.20.0 h1:+agJ3rEzKcCXKDKo0ml26UROcpcAlnZyjq+TjbY5Fto=
+github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
-github.com/tidwall/gjson v1.20.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
+github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
 github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
@@ -63,37 +67,37 @@ 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.4 h1:oat/nd3U6NeQqFEL3xpEJq7d7c86NI+DbSNGAs4xnjA=
-github.com/yuin/goldmark v1.8.6/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark v1.8.4/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.11.0 h1:JNEpkVRxfTdJUC0DIGKiRlLKzl4G/qLX/eVzoP7QuwY=
+go.mau.fi/util v0.9.12-0.20260719092501-f9c03d846391 h1:lsvBEY8MJfYdV61YbwikiQvb0Al/onbmLW5wfl/0tag=
-go.mau.fi/util v0.11.0/go.mod h1:04AEFVsc4zNdIkDC1gkdqbg/nZFolHY50pyXh2DSy7s=
+go.mau.fi/util v0.9.12-0.20260719092501-f9c03d846391/go.mod h1:xunp/oIQfFD68HHcNHfG0pOiHkvEtDhTweeIwKJ//+Q=
 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-20261026125351-1fbae988179a h1:ZyCV/mWfRkutxs5R0K3v+oyTbF4huprSlPZg/LEFQ7k=
+go.mau.fi/whatsmeow v0.0.0-20260805124304-6723e556f35a h1:TTRND9Dvq7YfT9vwJVQK4Zrit/sm3FHE74B5FWe8CgA=
-go.mau.fi/whatsmeow v0.0.0-20261026125351-1fbae988179a/go.mod h1:iY4lm61nTLWsNiIE1EmHUZwhKGBeoV4dhnVE2uMtNoQ=
+go.mau.fi/whatsmeow v0.0.0-20260805124304-6723e556f35a/go.mod h1:Iy/xVSuVU2payR26MB1hv0UZUWRraEn4qKZ7+VRHulg=
 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.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54=
+golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw=
-golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w=
+golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk=
-golang.org/x/exp v0.0.0-20261014143641-f0251eb4aa3e h1:HgI6W1OolKK6tcV74is+rl9SMT0njsHlp0TbQiGXI/A=
+golang.org/x/exp v0.0.0-20260709172345-9ea1abe57597 h1:qLvzZeaANDgyVOA8pyHCOStGlXn0rseXma+GQjeuv2g=
-golang.org/x/exp v0.0.0-20261014143641-f0251eb4aa3e/go.mod h1:DBoxwWhjaW8DJJw/YeM4zpeOKMC1FMXSblsYy+1mFSw=
+golang.org/x/exp v0.0.0-20260709172345-9ea1abe57597/go.mod h1:EdfpwwqSu+0Li0mzskwHU6FWDV3t9Q+RZDo3QMUtL3Q=
-golang.org/x/image v0.47.0 h1:za/8gVz++PPZqmZJBNSISICN5Rrj5zixP/8K++fgmqo=
+golang.org/x/image v0.44.0 h1:+tDekMZED9+LrtB3G5xzRggpVh9CARjZqROla3R3R+I=
-golang.org/x/image v0.47.0/go.mod h1:IkN5o4A7vq55vXN8FWjjnhg9Rs2GOtffqsSi9mWAKYE=
+golang.org/x/image v0.44.0/go.mod h1:V8K3KE9KKKE+pLpQDOeN18w9oacNSvy1tDOirTu4xtY=
-golang.org/x/mod v0.42.0 h1:ICeL3t2L30ljSPHHxDnR4fqVcBt/zR2zJAb9juavmQg=
+golang.org/x/mod v0.38.0 h1:MECBjubtXD7yj4HrhIUcywNaGeNVUdfVnxmPajOk4yk=
-golang.org/x/mod v0.42.0/go.mod h1:u5fzIrRInkL8MaO1cbRkUHT64v303YIT5KEqpNr7jRs=
+golang.org/x/mod v0.38.0/go.mod h1:V6Xz0pq8TQ3dGqVQ1FVHuelZpAL0uNhSkk9ogYP3c40=
-golang.org/x/net v0.61.0 h1:RR+6j/BTBCrggOLugxa+66R8FvoN6MHlzDlZIbN9YFw=
+golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE=
-golang.org/x/net v0.61.0/go.mod h1:WgDCOTH8iwtB66T4/GfI94AHo/hhdb7Hah9NDseQfiI=
+golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU=
-golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA=
+golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek=
-golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0=
+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.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA=
+golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
-golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
+golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc=
+golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
-golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s=
+golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
-google.golang.org/protobuf v1.36.12 h1:pJOKDDOyeXErUroCihFAd5LQuwXBSpVnKGrj5o/fwxc=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
-google.golang.org/protobuf v1.36.12/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -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.32.1-0.20261105141340-842796acf445 h1:ZI9Y2YEmjqQDloOCiciHeynTRYjUwK0ZZbNcRH/5NOc=
+maunium.net/go/mautrix v0.29.1-0.20260804113340-56938b8a508d h1:jbC6tXphot/X1UngnZLv7LcDTzaHBi2phwxrpyhtfrs=
-maunium.net/go/mautrix v0.32.1-0.20261105141340-842796acf445/go.mod h1:tZSwPzw+/0pa0dxGufkh0uJqM84BNxB6e2I0+S0UyjU=
+maunium.net/go/mautrix v0.29.1-0.20260804113340-56938b8a508d/go.mod h1:PeLuIih5jnbwb2xKNNi0Te7AtINEQE2Uv3p6iG3RV80=

pkg/connector/backfill.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"runtime/debug"
 	"slices"
 	"strconv"
 	"strings"
@@ -13,8 +12,6 @@ import (
 	"time"
 
 	"github.com/rs/zerolog"
-	"go.mau.fi/util/exerrors"
-	"go.mau.fi/util/exmaps"
 	"go.mau.fi/util/ptr"
 	"go.mau.fi/whatsmeow"
 	"go.mau.fi/whatsmeow/proto/waE2E"
@@ -64,7 +61,7 @@ func (wa *WhatsAppClient) historySyncLoop(ctx context.Context) {
 		}
 	}()
 	for {
-		var resetTimer, errored bool
+		var resetTimer bool
 		select {
 		case <-wa.historySyncWakeup:
 			dispatchTimer.Stop()
@@ -74,21 +71,12 @@ func (wa *WhatsAppClient) historySyncLoop(ctx context.Context) {
 			} else if notif == nil {
 				wa.UserLogin.Log.Debug().Msg("No more queued history sync notifications")
 			} else {
-				resetTimer, errored = wa.downloadAndSaveWAHistorySyncData(ctx, notif, rowid)
+				resetTimer = wa.downloadAndSaveWAHistorySyncData(ctx, notif, rowid)
 				// Continue waking up the loop until all queued notifications are processed
 				select {
 				case wa.historySyncWakeup <- struct{}{}:
 				default:
 				}
-				if errored {
-					wa.UserLogin.Log.Debug().Msg("Temporarily stopping history sync loop after error")
-					select {
-					case <-time.After(1 * time.Minute):
-					case <-ctx.Done():
-						wa.UserLogin.Log.Debug().Msg("Stopping main history sync loop")
-						return
-					}
-				}
 			}
 		case <-ctx.Done():
 			wa.UserLogin.Log.Debug().Msg("Stopping main history sync loop")
@@ -120,21 +108,13 @@ func (wa *WhatsAppClient) saveWAHistorySyncNotification(ctx context.Context, evt
 	}
 }
 
-func (wa *WhatsAppClient) downloadAndSaveWAHistorySyncData(ctx context.Context, evt *waE2E.HistorySyncNotification, rowid int) (resetTimer, errored bool) {
+func (wa *WhatsAppClient) downloadAndSaveWAHistorySyncData(ctx context.Context, evt *waE2E.HistorySyncNotification, rowid int) (resetTimer bool) {
 	log := wa.UserLogin.Log.With().
 		Str("action", "download history sync").
 		Stringer("sync_type", evt.GetSyncType()).
 		Uint32("chunk_order", evt.GetChunkOrder()).
 		Uint32("progress", evt.GetProgress()).
 		Logger()
-	defer func() {
-		if v := recover(); v != nil {
-			log.Err(exerrors.RecoverToError(v)).
-				Bytes(zerolog.ErrorStackFieldName, debug.Stack()).
-				Msg("History sync saving panicked")
-			errored = true
-		}
-	}()
 	log.Debug().
 		Int64("oldest_msg_in_chunk_ts", evt.GetOldestMsgInChunkTimestampSec()).
 		Any("full_request_meta", evt.GetFullHistorySyncOnDemandRequestMetadata()).
@@ -142,20 +122,11 @@ func (wa *WhatsAppClient) downloadAndSaveWAHistorySyncData(ctx context.Context,
 		Str("peer_data_request_session_id", evt.GetPeerDataRequestSessionID()).
 		Msg("Downloading history sync")
 	blob, err := wa.Client.DownloadHistorySync(log.WithContext(ctx), evt, true)
-	if errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith403) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith404) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith410) {
+	if err != nil {
-		log.Err(err).Msg("History sync blob is no longer available, dropping notification")
-		if err = wa.Main.DB.HSNotif.Delete(ctx, rowid); err != nil {
-			log.Err(err).Msg("Failed to delete queued history sync notification")
-			errored = true
-		}
-		return
-	} else if err != nil {
 		log.Err(err).Msg("Failed to download history sync")
-		errored = true
 		return
 	}
 	if blob.GetSyncType() == waHistorySync.HistorySync_ON_DEMAND {
-		wa.finishOnDemandHistorySyncRequest(evt.GetPeerDataRequestSessionID())
 		wa.handleOnDemandHistorySync(ctx, blob)
 		if err = wa.Main.DB.HSNotif.Delete(ctx, rowid); err != nil {
 			log.Err(err).Msg("Failed to delete queued on-demand history sync notification")
@@ -179,7 +150,6 @@ func (wa *WhatsAppClient) downloadAndSaveWAHistorySyncData(ctx context.Context,
 	})
 	if err != nil {
 		log.Err(err).Msg("Failed to store history sync notification data")
-		errored = true
 	} else {
 		resetTimer = blob.GetSyncType() == waHistorySync.HistorySync_INITIAL_BOOTSTRAP ||
 			blob.GetSyncType() == waHistorySync.HistorySync_RECENT ||
@@ -255,17 +225,10 @@ func (wa *WhatsAppClient) handleWAHistorySync(
 		} else if jid.Server == types.BroadcastServer {
 			log.Debug().Stringer("chat_jid", jid).Msg("Skipping broadcast list in history sync")
 			continue
-		} else if jid == types.PSAJID {
-			// New messages in the official updates chat aren't bridged because they use a different path,
-			// so drop history as well. This should be removed if the PSA chat gets properly bridged in the future.
-			log.Debug().Stringer("chat_jid", jid).Msg("Skipping PSA in history sync")
-			continue
 		} else {
 			totalMessageCount += len(conv.GetMessages())
 		}
-		if jid == types.MetaAIJID {
+		if jid.Server == types.DefaultUserServer {
-			jid = types.NewMetaAIJID
-		} else if jid.Server == types.DefaultUserServer {
 			lid, err := wa.GetStore().LIDs.GetLIDForPN(ctx, jid)
 			if err != nil {
 				log.Err(err).Stringer("pn", jid).Msg("Failed to get LID for phone number in history sync")
@@ -283,14 +246,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(conv.GetMessages()))
-		messages := make([]*wadb.HistorySyncMessageTuple, 0, len(rawMessages))
+		for i, rawMsg := range conv.GetMessages() {
-		allowClamp := conv.GetCommentsCount() == 0
-		var newerTS uint64
-		for i, rawMsg := range rawMessages {
 			// Don't store messages that will just be skipped.
 			msgEvt, err := wa.Client.ParseWebMessage(jid, rawMsg.GetMessage())
 			if err != nil {
@@ -298,9 +259,6 @@ func (wa *WhatsAppClient) handleWAHistorySync(
 					Int("msg_index", i).
 					Str("msg_id", rawMsg.GetMessage().GetKey().GetID()).
 					Uint64("msg_time_seconds", rawMsg.GetMessage().GetMessageTimestamp()).
-					Stringer("stub_type", rawMsg.GetMessage().GetMessageStubType()).
-					Str("message_type", getMessageType(rawMsg.GetMessage().GetMessage())).
-					Bool("from_me", rawMsg.GetMessage().GetKey().GetFromMe()).
 					Msg("Dropping historical message due to parse error")
 				log.Trace().
 					Any("web_message_info", rawMsg.GetMessage()).
@@ -311,30 +269,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).
@@ -349,8 +297,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()).
@@ -366,7 +319,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)
@@ -406,13 +359,6 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) {
 	log := wa.UserLogin.Log.With().
 		Str("action", "create portals from history sync").
 		Logger()
-	defer func() {
-		if v := recover(); v != nil {
-			log.Err(exerrors.RecoverToError(v)).
-				Bytes(zerolog.ErrorStackFieldName, debug.Stack()).
-				Msg("History sync portal creation panicked")
-		}
-	}()
 	ctx = log.WithContext(ctx)
 	limit := wa.Main.Config.HistorySync.MaxInitialConversations
 	loginTS := wa.UserLogin.Metadata.(*waid.UserLoginMetadata).LoggedInAt
@@ -454,7 +400,7 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) {
 			return
 		}
 		wrappedInfo, err := wa.getChatInfo(ctx, conv.ChatJID, conv, true)
-		if errors.Is(err, whatsmeow.ErrNotInGroup) || errors.Is(err, whatsmeow.ErrGroupNotFound) || errors.Is(err, ErrNewsletterNotFound) {
+		if errors.Is(err, whatsmeow.ErrNotInGroup) || errors.Is(err, whatsmeow.ErrGroupNotFound) {
 			log.Debug().Err(err).Stringer("chat_jid", conv.ChatJID).
 				Msg("Skipping creating room because the user is not a participant")
 			//err = wa.Main.DB.Message.DeleteAllInChat(ctx, wa.UserLogin.ID, conv.ChatJID)
@@ -578,7 +524,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,
@@ -605,36 +550,16 @@ func (wa *WhatsAppClient) FetchMessages(ctx context.Context, params bridgev2.Fet
 			}
 		}
 	}
-	resp, err := wa.convertHistorySyncMessages(ctx, params.Portal, portalJID, messages, true, !params.Forward && !hasMore)
+	resp, err := wa.convertHistorySyncMessages(ctx, params.Portal, portalJID, messages, true)
 	if err != nil {
 		return nil, fmt.Errorf("failed to convert messages: %w", err)
 	}
-	// TODO might be better to always set true here and let GetBetween return an empty result to mark as false?
 	resp.HasMore = hasMore
 	resp.Forward = params.Forward
 	resp.MarkRead = markRead
-	if params.Forward && !markRead && conv != nil && !ptr.Val(conv.MarkedAsUnread) {
-		resp.ReadUpTo = historySyncReadUpTo(resp.Messages, int(ptr.Val(conv.UnreadCount)))
-	}
 	return resp, nil
 }
 
-func historySyncReadUpTo(messages []*bridgev2.BackfillMessage, unreadCount int) time.Time {
-	if unreadCount <= 0 {
-		return time.Time{}
-	}
-	for i := len(messages) - 1; i >= 0; i-- {
-		if messages[i].Sender.IsFromMe {
-			continue
-		}
-		unreadCount--
-		if unreadCount == 0 {
-			return messages[i].Timestamp.Add(-time.Nanosecond)
-		}
-	}
-	return time.Time{}
-}
-
 func (wa *WhatsAppClient) deleteHistorySyncMessages(ctx context.Context, portalJID types.JID, newestTS, oldestTS uint64) {
 	var err error
 	var rows int64
@@ -667,19 +592,13 @@ func (wa *WhatsAppClient) convertHistorySyncMessages(
 	portalJID types.JID,
 	messages []*waWeb.WebMessageInfo,
 	explodeOnError bool,
-	deleteEverything bool,
 ) (*bridgev2.FetchMessagesResponse, error) {
-	cli := wa.Client
-	if cli == nil {
-		return nil, bridgev2.ErrNotLoggedIn
-	}
 	oldestTS := messages[len(messages)-1].GetMessageTimestamp()
 	newestTS := messages[0].GetMessageTimestamp()
 	convertedMessages := make([]*bridgev2.BackfillMessage, 0, len(messages))
 	var mediaRequests []*wadb.MediaRequest
-	dups := make(exmaps.Set[networkid.MessageID])
 	for i, msg := range messages {
-		evt, err := cli.ParseWebMessage(portalJID, msg)
+		evt, err := wa.Client.ParseWebMessage(portalJID, msg)
 		if err != nil {
 			if explodeOnError {
 				// This should never happen because the info is already parsed once before being stored in the database
@@ -704,18 +623,10 @@ func (wa *WhatsAppClient) convertHistorySyncMessages(
 		if !wa.ensureAltJIDs(ctx, &evt.Info.MessageSource, false) {
 			return nil, fmt.Errorf("failed to ensure alt JIDs for message %s", evt.Info.ID)
 		}
-		if evt.Info.IsFromMe {
-			wa.addPreviousOwnLID(ctx, evt.Info.Sender)
-		}
 		isViewOnce := evt.IsViewOnce || evt.IsViewOnceV2 || evt.IsViewOnceV2Extension
 		converted, mediaReq := wa.convertHistorySyncMessage(
-			ctx, cli, portal, &evt.Info, evt.Message, evt.RawMessage, isViewOnce, msg.Reactions,
+			ctx, portal, &evt.Info, evt.Message, evt.RawMessage, isViewOnce, msg.Reactions,
 		)
-		// This is a hack to remove duplicates where the same message is inserted with both the LID and phone number sender
-		// TODO prevent those being inserted in the first place instead of hacking around it here
-		if !dups.Add(converted.ID) {
-			continue
-		}
 		convertedMessages = append(convertedMessages, converted)
 		if mediaReq != nil {
 			mediaRequests = append(mediaRequests, mediaReq)
@@ -726,11 +637,9 @@ func (wa *WhatsAppClient) convertHistorySyncMessages(
 		Messages: convertedMessages,
 		Cursor:   networkid.PaginationCursor(strconv.FormatUint(oldestTS, 10)),
 		CompleteCallback: func() {
-			if deleteEverything {
+			// TODO this only deletes after backfilling. If there's no need for backfill after a relogin,
-				wa.deleteHistorySyncMessages(ctx, portalJID, 1<<62, oldestTS)
+			//      the messages will be stuck in the database
-			} else {
+			wa.deleteHistorySyncMessages(ctx, portalJID, newestTS, oldestTS)
-				wa.deleteHistorySyncMessages(ctx, portalJID, newestTS, oldestTS)
-			}
 			if len(mediaRequests) > 0 {
 				go func(ctx context.Context) {
 					for _, req := range mediaRequests {
@@ -752,28 +661,12 @@ func (wa *WhatsAppClient) fetchMessagesFromPhone(ctx context.Context, portalJID
 	if params.AnchorMessage == nil {
 		return nil, fmt.Errorf("anchor message is required to fetch messages from phone")
 	}
-	anchor := params.AnchorMessage
+	parsed, err := waid.ParseMessageID(params.AnchorMessage.ID)
-	parsed, err := waid.ParseMessageID(anchor.ID)
 	if err != nil {
-		anchor, err = wa.Main.Bridge.DB.Message.GetFirstPortalMessageExcludingIDPattern(ctx, params.Portal.PortalKey, "fake:%")
+		return nil, fmt.Errorf("failed to parse anchor message ID: %w", err)
-		if err != nil {
-			return nil, fmt.Errorf("failed to get first non-fake portal message: %w", err)
-		} else if anchor == nil {
-			return &bridgev2.FetchMessagesResponse{}, nil
-		}
-		parsed, err = waid.ParseMessageID(anchor.ID)
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse anchor message ID: %w", err)
-		}
 	}
 
 	msgID := wa.Client.GenerateMessageID()
-	if !wa.startOnDemandHistorySyncRequest(ctx, portalJID, msgID) {
-		return &bridgev2.FetchMessagesResponse{
-			HasMore: true,
-			Pending: true,
-		}, nil
-	}
 	reqData := wa.Client.BuildHistorySyncRequest(&types.MessageInfo{
 		MessageSource: types.MessageSource{
 			Chat:     portalJID,
@@ -782,7 +675,7 @@ func (wa *WhatsAppClient) fetchMessagesFromPhone(ctx context.Context, portalJID
 			IsGroup:  parsed.Chat.Server == types.GroupServer,
 		},
 		ID:        parsed.ID,
-		Timestamp: anchor.Timestamp,
+		Timestamp: params.AnchorMessage.Timestamp,
 	}, 50)
 	zerolog.Ctx(ctx).Debug().
 		Str("request_msg_id", msgID).
@@ -795,9 +688,6 @@ func (wa *WhatsAppClient) fetchMessagesFromPhone(ctx context.Context, portalJID
 		Peer: true,
 	})
 	if err != nil {
-		wa.onDemandHistorySyncLock.Lock()
-		delete(wa.onDemandHistorySyncRequests, portalJID)
-		wa.onDemandHistorySyncLock.Unlock()
 		return nil, fmt.Errorf("failed to send history sync request: %w", err)
 	}
 	return &bridgev2.FetchMessagesResponse{
@@ -806,38 +696,6 @@ func (wa *WhatsAppClient) fetchMessagesFromPhone(ctx context.Context, portalJID
 	}, nil
 }
 
-type onDemandHistorySyncRequest struct {
-	ID     types.MessageID
-	SentAt time.Time
-}
-
-const onDemandHistorySyncRequestTimeout = 1 * time.Hour
-
-func (wa *WhatsAppClient) startOnDemandHistorySyncRequest(ctx context.Context, portalJID types.JID, msgID types.MessageID) bool {
-	wa.onDemandHistorySyncLock.Lock()
-	defer wa.onDemandHistorySyncLock.Unlock()
-	if req, inFlight := wa.onDemandHistorySyncRequests[portalJID]; inFlight && time.Since(req.SentAt) < onDemandHistorySyncRequestTimeout {
-		zerolog.Ctx(ctx).Debug().
-			Str("in_flight_request_msg_id", req.ID).
-			Stringer("portal_jid", portalJID).
-			Time("sent_at", req.SentAt).
-			Msg("Not sending history sync request, previous request is still in flight")
-		return false
-	}
-	wa.onDemandHistorySyncRequests[portalJID] = onDemandHistorySyncRequest{ID: msgID, SentAt: time.Now()}
-	return true
-}
-
-func (wa *WhatsAppClient) finishOnDemandHistorySyncRequest(sessionID string) {
-	wa.onDemandHistorySyncLock.Lock()
-	defer wa.onDemandHistorySyncLock.Unlock()
-	for chatJID, req := range wa.onDemandHistorySyncRequests {
-		if req.ID == sessionID {
-			delete(wa.onDemandHistorySyncRequests, chatJID)
-		}
-	}
-}
-
 func (wa *WhatsAppClient) handleOnDemandHistorySync(ctx context.Context, blob *waHistorySync.HistorySync) {
 	if len(blob.GetConversations()) > 1 {
 		zerolog.Ctx(ctx).Warn().
@@ -850,9 +708,7 @@ func (wa *WhatsAppClient) handleOnDemandHistorySync(ctx context.Context, blob *w
 			zerolog.Ctx(ctx).Err(err).Str("jid", conv.GetID()).Msg("Failed to parse portal JID")
 			continue
 		}
-		if portalJID == types.MetaAIJID {
+		if portalJID.Server == types.DefaultUserServer {
-			portalJID = types.NewMetaAIJID
-		} else if portalJID.Server == types.DefaultUserServer {
 			lid, err := wa.GetStore().LIDs.GetLIDForPN(ctx, portalJID)
 			if err != nil {
 				zerolog.Ctx(ctx).Err(err).Stringer("lid", portalJID).Msg("Failed to get LID for phone number in on-demand history sync")
@@ -893,7 +749,7 @@ func (wa *WhatsAppClient) handleOnDemandHistorySync(ctx context.Context, blob *w
 					Int("message_count", len(messages)).
 					Stringer("end_of_history_type", conv.GetEndOfHistoryTransferType()).
 					Msg("Converting messages to bridge from on-demand history sync")
-				resp, err := wa.convertHistorySyncMessages(ctx, portal, portalJID, messages, false, false)
+				resp, err := wa.convertHistorySyncMessages(ctx, portal, portalJID, messages, false)
 				if err != nil {
 					return nil, err
 				}
@@ -905,7 +761,7 @@ func (wa *WhatsAppClient) handleOnDemandHistorySync(ctx context.Context, blob *w
 }
 
 func (wa *WhatsAppClient) convertHistorySyncMessage(
-	ctx context.Context, cli *whatsmeow.Client, portal *bridgev2.Portal, info *types.MessageInfo, msg, rawMsg *waE2E.Message, isViewOnce bool, reactions []*waWeb.Reaction,
+	ctx context.Context, portal *bridgev2.Portal, info *types.MessageInfo, msg, rawMsg *waE2E.Message, isViewOnce bool, reactions []*waWeb.Reaction,
 ) (*bridgev2.BackfillMessage, *wadb.MediaRequest) {
 	// New messages turn these into edits, but in backfill we only have the last version,
 	// so no need to do the edit thing. Instead, just unwrap the message.
@@ -916,7 +772,7 @@ func (wa *WhatsAppClient) convertHistorySyncMessage(
 	intent := wa.Main.Bridge.Bot
 	msgID := waid.MakeMessageIDWithAltSender(info.Chat, info.Sender, info.SenderAlt, info.ID)
 	wrapped := &bridgev2.BackfillMessage{
-		ConvertedMessage: wa.Main.MsgConv.ToMatrix(ctx, portal, cli, intent, msg, rawMsg, info, isViewOnce, true, nil),
+		ConvertedMessage: wa.Main.MsgConv.ToMatrix(ctx, portal, wa.Client, intent, msg, rawMsg, info, isViewOnce, true, nil),
 		Sender:           wa.makeEventSender(ctx, pickLID(info.Sender, info.SenderAlt)),
 		ID:               msgID,
 		TxnID:            networkid.TransactionID(msgID),

pkg/connector/capabilities.go

@@ -52,7 +52,7 @@ func (wa *WhatsAppConnector) GetCapabilities() *bridgev2.NetworkGeneralCapabilit
 }
 
 func (wa *WhatsAppConnector) GetBridgeInfoVersion() (info, caps int) {
-	return 1, 10
+	return 1, 9
 }
 
 const WAMaxFileSize = 2000 * 1024 * 1024
@@ -67,7 +67,7 @@ func supportedIfFFmpeg() event.CapabilitySupportLevel {
 }
 
 func capID() string {
-	base := "fi.mau.whatsapp.capabilities.2026_10_01"
+	base := "fi.mau.whatsapp.capabilities.2026_07_22"
 	if ffmpeg.Supported() {
 		return base + "+ffmpeg"
 	}
@@ -198,7 +198,6 @@ var whatsappCaps = &event.RoomFeatures{
 
 var whatsappDMCaps *event.RoomFeatures
 var whatsappCAGCaps *event.RoomFeatures
-var whatsappNoteToSelfCaps *event.RoomFeatures
 
 func init() {
 	whatsappDMCaps = ptr.Clone(whatsappCaps)
@@ -206,13 +205,7 @@ func init() {
 	whatsappDMCaps.State = event.StateFeatureMap{
 		event.StateBeeperDisappearingTimer.Type: {Level: event.CapLevelFullySupported},
 	}
-	whatsappDMCaps.BlockUser = true
 	whatsappDMCaps.MemberActions = nil
-
-	whatsappNoteToSelfCaps = ptr.Clone(whatsappDMCaps)
-	whatsappNoteToSelfCaps.ID = capID() + "+self"
-	whatsappNoteToSelfCaps.BlockUser = false
-
 	whatsappCAGCaps = ptr.Clone(whatsappCaps)
 	whatsappCAGCaps.ID = capID() + "+cag"
 	whatsappCAGCaps.Reply = event.CapLevelUnsupported
@@ -223,10 +216,6 @@ func (wa *WhatsAppClient) GetCapabilities(ctx context.Context, portal *bridgev2.
 	if portal.Metadata.(*waid.PortalMetadata).CommunityAnnouncementGroup {
 		return whatsappCAGCaps
 	} else if portal.RoomType == database.RoomTypeDM {
-		jid, err := waid.ParsePortalID(portal.ID)
-		if err == nil && wa.IsOwnJID(jid) {
-			return whatsappNoteToSelfCaps
-		}
 		return whatsappDMCaps
 	}
 	return whatsappCaps

pkg/connector/chatinfo.go

@@ -10,7 +10,6 @@ import (
 	"go.mau.fi/util/jsontime"
 	"go.mau.fi/util/ptr"
 	"go.mau.fi/whatsmeow"
-	"go.mau.fi/whatsmeow/appstate"
 	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
 	"maunium.net/go/mautrix/bridgev2"
@@ -30,21 +29,15 @@ 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")
-var ErrNewsletterNotFound = errors.New("newsletter doesn't exist")
-
 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:
 		wrapped = wa.wrapDMInfo(ctx, portalJID)
-		if portalJID == types.MuseJID {
-			go wa.requestMuseProfile(ctx)
-		}
 	case types.BroadcastServer:
 		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)
@@ -57,8 +50,6 @@ func (wa *WhatsAppClient) getChatInfo(ctx context.Context, portalJID types.JID,
 		info, err := wa.Client.GetNewsletterInfo(ctx, portalJID)
 		if err != nil {
 			return nil, err
-		} else if info == nil || info.ID.IsEmpty() {
-			return nil, ErrNewsletterNotFound
 		}
 		wrapped = wa.wrapNewsletterInfo(ctx, info)
 	default:
@@ -120,16 +111,9 @@ func (wa *WhatsAppClient) applyChatSettings(ctx context.Context, chatID types.JI
 			return
 		}
 	}
-	wa.appStateRecoveryLock.Lock()
+	info.UserLocal = &bridgev2.UserLocalPortalInfo{
-	_, muteStateBroken := wa.UserLogin.Metadata.(*waid.UserLoginMetadata).AppStateRecoveryAttempted[appstate.WAPatchRegularHigh]
+		MutedUntil: ptr.Ptr(chat.MutedUntil),
-	wa.appStateRecoveryLock.Unlock()
-	userLocal := &bridgev2.UserLocalPortalInfo{}
-	if !muteStateBroken {
-		userLocal.MutedUntil = ptr.Ptr(chat.MutedUntil)
-	} else if info.UserLocal != nil {
-		userLocal.MutedUntil = info.UserLocal.MutedUntil
 	}
-	info.UserLocal = userLocal
 	if chat.Pinned {
 		info.UserLocal.Tag = ptr.Ptr(wa.Main.Config.PinnedTag)
 	} else if chat.Archived {
@@ -196,11 +180,6 @@ func (wa *WhatsAppClient) wrapDMInfo(ctx context.Context, jid types.JID) *bridge
 		},
 		ExcludeChangesFromTimeline: true,
 	}
-	var err error
-	info.UserBlocked, err = wa.isUserBlocked(ctx, jid)
-	if err != nil {
-		zerolog.Ctx(ctx).Warn().Err(err).Msg("Failed to get blocked state")
-	}
 	if jid.Server == types.BotServer {
 		info.Topic = ptr.Ptr(BotChatTopic)
 	}
@@ -279,8 +258,6 @@ func setTopicID(id, topic string) bridgev2.ExtraUpdater[*bridgev2.Portal] {
 
 func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupInfo) *bridgev2.ChatInfo {
 	sendEventPL := defaultPL
-	// Community announcement groups allow non-admins to send threaded replies.
-	// Power levels can't represent that, but the power level is checked separately when handling messages.
 	if info.IsAnnounce && !info.IsDefaultSubGroup {
 		sendEventPL = adminPL
 	}
@@ -294,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{
@@ -308,14 +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.StateRoomName:   metaChangePL,
-					event.StateRoomAvatar:              metaChangePL,
+					event.StateRoomAvatar: metaChangePL,
-					event.StateTopic:                   metaChangePL,
+					event.StateTopic:      metaChangePL,
-					event.EventEncrypted:               defaultPL, // Need to always allow encrypted events for poll responses
+					event.EventReaction:   defaultPL,
-					event.EventReaction:                defaultPL,
+					event.EventRedaction:  defaultPL,
-					event.EventRedaction:               defaultPL,
+
-					event.EventUnstablePollResponse:    defaultPL,
 					event.StateBeeperDisappearingTimer: metaChangePL,
+					// TODO always allow poll responses
 				},
 			},
 		},
@@ -340,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{
@@ -583,27 +556,10 @@ func (wa *WhatsAppClient) wrapNewsletterInfo(ctx context.Context, info *types.Ne
 					event.StateTopic:      adminPL,
 					event.EventReaction:   defaultPL,
 					event.EventRedaction:  defaultPL,
-					// TODO support poll votes in channels
+					// TODO always allow poll responses
-					//event.EventUnstablePollResponse: defaultPL,
 				},
 			},
 		},
 		Type: ptr.Ptr(database.RoomTypeDefault),
 	}
 }
-
-func (wa *WhatsAppClient) isUserBlocked(ctx context.Context, jid types.JID) (*bool, error) {
-	wa.blocklistLock.Lock()
-	defer wa.blocklistLock.Unlock()
-	meta := wa.UserLogin.Metadata.(*waid.UserLoginMetadata)
-	blocklist := meta.Blocklist
-	if blocklist == nil {
-		runHandlers := wa.resyncBlocklistUnlocked(ctx)
-		go runHandlers()
-		blocklist = meta.Blocklist
-	}
-	if blocklist == nil {
-		return nil, nil
-	}
-	return new(blocklist.IsBlocked(jid)), nil
-}

pkg/connector/client.go

@@ -54,12 +54,8 @@ func (wa *WhatsAppConnector) LoadUserLogin(ctx context.Context, login *bridgev2.
 		directMediaRetries:        make(map[networkid.MessageID]*directMediaRetry),
 		mediaRetryLock:            semaphore.NewWeighted(wa.Config.HistorySync.MediaRequests.MaxAsyncHandle),
 		pushNamesSynced:           exsync.NewEvent(),
+		createDedup:               exsync.NewSet[types.MessageID](),
 		appStateFullSyncAttempted: make(map[appstate.WAPatchName]time.Time),
-		previousOwnLIDs:           exsync.NewSetWithItems(login.Metadata.(*waid.UserLoginMetadata).PreviousOwnLIDs),
-
-		onDemandHistorySyncRequests: make(map[types.JID]onDemandHistorySyncRequest),
-
-		disableNewsletter: store.BaseClientPayload.GetUserAgent().GetPlatform() == waWa6.ClientPayload_UserAgent_MACOS,
 	}
 	login.Client = w
 
@@ -81,11 +77,10 @@ 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
-		w.Client.UnifiedSessionInterval = 24 * time.Hour
 		w.Client.GetMessageForRetry = w.trackNotFoundRetry
 		w.Client.PreRetryCallback = w.trackFoundRetry
 		w.Client.BackgroundEventCtx = w.UserLogin.Log.WithContext(wa.Bridge.BackgroundCtx)
@@ -120,28 +115,15 @@ 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
 	pushNamesSynced    *exsync.Event
 	lastPresence       types.Presence
-	blocklistLock      sync.Mutex
+	createDedup        *exsync.Set[types.MessageID]
-
-	disableNewsletter bool
 
 	appStateRecoveryLock      sync.Mutex
 	appStateFullSyncAttempted map[appstate.WAPatchName]time.Time
-
-	wasaResyncLock         sync.Mutex
-	museProfileLock        sync.Mutex
-	lastMuseProfileRequest time.Time
-
-	onDemandHistorySyncLock     sync.Mutex
-	onDemandHistorySyncRequests map[types.JID]onDemandHistorySyncRequest
-
-	previousOwnLIDs     *exsync.Set[types.JID]
-	previousOwnLIDsLock sync.Mutex
 }
 
 var (
@@ -210,26 +192,7 @@ func (wa *WhatsAppClient) IsThisUser(_ context.Context, userID networkid.UserID)
 
 func (wa *WhatsAppClient) IsOwnJID(jid types.JID) bool {
 	return (jid.Server == types.DefaultUserServer && jid.User == wa.JID.User) ||
-		(jid.Server == types.HiddenUserServer && jid.User == wa.GetLID().User) ||
+		(jid.Server == types.HiddenUserServer && jid.User == wa.GetLID().User)
-		wa.previousOwnLIDs.Has(jid.ToNonAD())
-}
-
-func (wa *WhatsAppClient) addPreviousOwnLID(ctx context.Context, jid types.JID) {
-	if jid.Server != types.HiddenUserServer || wa.IsOwnJID(jid) {
-		return
-	}
-	jid = jid.ToNonAD()
-	wa.previousOwnLIDsLock.Lock()
-	defer wa.previousOwnLIDsLock.Unlock()
-	if !wa.previousOwnLIDs.Add(jid) {
-		return
-	}
-	zerolog.Ctx(ctx).Info().Stringer("lid", jid).Msg("Found previous own LID in history sync")
-	wa.UserLogin.Metadata.(*waid.UserLoginMetadata).PreviousOwnLIDs = wa.previousOwnLIDs.AsList()
-	err := wa.UserLogin.Save(ctx)
-	if err != nil {
-		zerolog.Ctx(ctx).Err(err).Msg("Failed to save user login after adding previous own LID")
-	}
 }
 
 func (wa *WhatsAppClient) GetLID() types.JID {
@@ -240,17 +203,13 @@ func (wa *WhatsAppClient) GetLID() types.JID {
 }
 
 func (wa *WhatsAppClient) Connect(ctx context.Context) {
-	wa.connect(ctx)
-}
-
-func (wa *WhatsAppClient) connect(ctx context.Context) bool {
 	if wa.Client == nil {
 		state := status.BridgeState{
 			StateEvent: status.StateBadCredentials,
 			Error:      WANotLoggedIn,
 		}
 		wa.UserLogin.BridgeState.Send(state)
-		return false
+		return
 	}
 	wa.UserLogin.BridgeState.Send(status.BridgeState{StateEvent: status.StateConnecting})
 	wa.Main.firstClientConnectOnce.Do(wa.Main.onFirstClientConnect)
@@ -258,7 +217,7 @@ func (wa *WhatsAppClient) connect(ctx context.Context) bool {
 		zerolog.Ctx(ctx).Err(err).Msg("Failed to update proxy")
 	}
 	if ctx.Err() != nil {
-		return false
+		return
 	}
 	wa.initMC()
 	wa.startLoops()
@@ -275,9 +234,7 @@ func (wa *WhatsAppClient) connect(ctx context.Context) bool {
 			},
 		}
 		wa.UserLogin.BridgeState.Send(state)
-		return false
 	}
-	return true
 }
 
 func (wa *WhatsAppClient) notifyOfflineSyncWaiter(err error) {
@@ -434,10 +391,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 {
@@ -494,10 +447,6 @@ func (wa *WhatsAppClient) HandleMatrixViewingChat(ctx context.Context, msg *brid
 		}
 	}
 
-	if msg.Portal != nil && msg.Portal.ID == waid.MakePortalID(types.MuseJID) {
-		go wa.requestMuseProfile(ctx)
-	}
-
 	if msg.Portal == nil || msg.Portal.Metadata.(*waid.PortalMetadata).LastSync.Add(5*time.Minute).After(time.Now()) {
 		// If we resynced this portal within the last 5 minutes, don't do it again
 		return nil

pkg/connector/commands.go

@@ -148,7 +148,13 @@ func fnSync(ce *commands.Event) {
 	case "appstate":
 		names := appstate.AllPatchNames[:]
 		if len(ce.Args) > 1 {
-			names = parseAppStateNames(ce, ce.Args[1:])
+			names = exslices.CastFuncFilter(ce.Args[1:], func(name string) (appstate.WAPatchName, bool) {
+				if !slices.Contains(appstate.AllPatchNames[:], appstate.WAPatchName(name)) {
+					ce.Reply("Invalid app state name `%s`", name)
+					return "", false
+				}
+				return appstate.WAPatchName(name), true
+			})
 		}
 		for _, name := range names {
 			err := wa.Client.FetchAppState(ce.Ctx, name, true, false)
@@ -168,50 +174,6 @@ func fnSync(ce *commands.Event) {
 	}
 }
 
-func parseAppStateNames(ce *commands.Event, args []string) []appstate.WAPatchName {
-	return exslices.CastFuncFilter(args, func(name string) (appstate.WAPatchName, bool) {
-		if !slices.Contains(appstate.AllPatchNames[:], appstate.WAPatchName(name)) {
-			ce.Reply("Invalid app state name `%s`", name)
-			return "", false
-		}
-		return appstate.WAPatchName(name), true
-	})
-}
-
-var cmdResetAppState = &commands.FullHandler{
-	Func: fnResetAppState,
-	Name: "reset-appstate",
-	Help: commands.HelpMeta{
-		Section:     commands.HelpSectionAdmin,
-		Description: "Ask your phone to reset broken app state. This logs out all linked devices.",
-		Args:        "<names...>",
-	},
-	RequiresLogin: true,
-}
-
-func fnResetAppState(ce *commands.Event) {
-	login := ce.User.GetDefaultLogin()
-	if login == nil {
-		ce.Reply("Login not found")
-		return
-	}
-	if len(ce.Args) == 0 {
-		ce.Reply("Usage: `$cmdprefix reset-appstate <names...>`\n\nThis logs out all linked devices, including the bridge. You'll have to log in again afterwards.")
-		return
-	}
-	names := parseAppStateNames(ce, ce.Args)
-	if len(names) != len(ce.Args) {
-		return
-	}
-	wa := login.Client.(*WhatsAppClient)
-	_, err := wa.Client.SendPeerMessage(ce.Ctx, whatsmeow.BuildFatalAppStateExceptionNotification(names...))
-	if err != nil {
-		ce.Reply("Failed to send app state reset request: %v", err)
-		return
-	}
-	ce.Reply("Sent app state reset request. Your phone should log out all linked devices shortly, after which you can log in again.")
-}
-
 var cmdInviteLink = &commands.FullHandler{
 	Func: fnInviteLink,
 	Name: "invite-link",

pkg/connector/config.go

@@ -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,

pkg/connector/connector.go

@@ -110,7 +110,7 @@ func (wa *WhatsAppConnector) Init(bridge *bridgev2.Bridge) {
 	wa.DB = wadb.New(bridge.ID, bridge.DB.Database, bridge.Log.With().Str("db_section", "whatsapp").Logger())
 	wa.MsgConv.DB = wa.DB
 	wa.Bridge.Commands.(*commands.Processor).AddHandlers(
-		cmdAccept, cmdSync, cmdResetAppState, cmdInviteLink, cmdResolveLink, cmdJoin,
+		cmdAccept, cmdSync, cmdInviteLink, cmdResolveLink, cmdJoin,
 	)
 	wa.mediaEditCache = make(MediaEditCache)
 	wa.unmigratedDMs = exsync.NewSet[networkid.PortalKey]()
@@ -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,25 +157,7 @@ func (wa *WhatsAppConnector) Start(ctx context.Context) error {
 		return bridgev2.DBUpgradeError{Err: err, Section: "whatsapp"}
 	}
 
-	err = wa.migrateToLIDDMs(ctx)
+	return wa.migrateToLIDDMs(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to migrate to LID DMs: %w", err)
-	}
-	err = wa.migrateMetaAIPortals(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to migrate Meta AI portals: %w", err)
-	}
-	go func() {
-		err = wa.syncMismatchingGhosts(wa.Bridge.BackgroundCtx)
-		if err != nil {
-			wa.Bridge.Log.Err(err).Msg("Failed to sync mismatching ghosts")
-		}
-		err = wa.removeRejoinedPNGhosts(wa.Bridge.BackgroundCtx)
-		if err != nil {
-			wa.Bridge.Log.Err(err).Msg("Failed to remove rejoined PN ghosts")
-		}
-	}()
-	return nil
 }
 
 func (wa *WhatsAppConnector) Stop() {
@@ -243,16 +222,7 @@ func (wa *WhatsAppConnector) GenerateTransactionID(_ id.UserID, _ id.RoomID, _ e
 }
 
 func (wa *WhatsAppConnector) ResetHTTPTransport() {
-	for _, login := range wa.Bridge.GetAllCachedUserLogins() {
+	// No-op for now, whatsmeow doesn't use the shared transport config yet
-		client := login.Client.(*WhatsAppClient).Client
-		if client == nil {
-			continue
-		}
-		err := wa.updateProxy(login.Log.WithContext(wa.Bridge.BackgroundCtx), client, false)
-		if err != nil {
-			login.Log.Err(err).Msg("Failed to recreate HTTP clients")
-		}
-	}
 }
 
 func (wa *WhatsAppConnector) ResetNetworkConnections() {

pkg/connector/directmedia.go

@@ -30,11 +30,9 @@ 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"
-	"go.mau.fi/whatsmeow/types"
 	"go.mau.fi/whatsmeow/types/events"
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/bridgev2"
@@ -86,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")
@@ -103,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).
@@ -111,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 {
@@ -137,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) {
@@ -164,19 +146,7 @@ func (wa *WhatsAppConnector) downloadStickerDirectMedia(ctx context.Context, par
 		return nil, fmt.Errorf("no WhatsApp client found on login %s", parsedID.UserLogin)
 	}
 	sticker, err := wa.MsgConv.GetCachedSticker(ctx, waClient.Client, parsedID.Sticker.PackID, parsedID.Sticker.FileHash)
-	var httpErr whatsmeow.DownloadHTTPError
+	if err != nil {
-	if errors.As(err, &httpErr) {
-		switch httpErr.StatusCode {
-		case http.StatusNotFound, http.StatusGone:
-			return nil, mautrix.MNotFound.WithMessage("Sticker pack not found")
-		case http.StatusUnauthorized, http.StatusForbidden:
-			return nil, mautrix.MForbidden.WithMessage("WhatsApp denied access to the sticker pack")
-		case http.StatusTooManyRequests:
-			return nil, mautrix.MLimitExceeded.WithMessage("Rate limited by WhatsApp while fetching the sticker pack").WithCanRetry(true)
-		default:
-			return nil, mautrix.MUnknown.WithMessage("WhatsApp returned HTTP %d while fetching the sticker pack", httpErr.StatusCode).WithStatus(http.StatusBadGateway).WithCanRetry(true)
-		}
-	} else if err != nil {
 		return nil, err
 	} else if sticker == nil {
 		return nil, mautrix.MNotFound.WithMessage("Sticker not found in pack")
@@ -186,9 +156,6 @@ func (wa *WhatsAppConnector) downloadStickerDirectMedia(ctx context.Context, par
 
 func (wa *WhatsAppConnector) downloadMessageDirectMedia(ctx context.Context, parsedID *waid.ParsedMediaID, params map[string]string) (mediaproxy.GetMediaResponse, error) {
 	msg, err := wa.Bridge.DB.Message.GetFirstPartByID(ctx, parsedID.UserLogin, parsedID.Message.String())
-	if err == nil && msg == nil && parsedID.Message.Chat.Server == types.HiddenUserServer && parsedID.Message.Sender.Server == types.DefaultUserServer {
-		msg, err = wa.getDirectMediaMessageWithLIDSender(ctx, parsedID)
-	}
 	if err != nil {
 		return nil, fmt.Errorf("failed to get message: %w", err)
 	} else if msg == nil {
@@ -231,16 +198,6 @@ func (wa *WhatsAppConnector) downloadMessageDirectMedia(ctx context.Context, par
 	return wa.makeDirectMediaResponse(ctx, waClient, keys, keys.MimeType, msg.ID, keys, params)
 }
 
-func (wa *WhatsAppConnector) getDirectMediaMessageWithLIDSender(ctx context.Context, parsedID *waid.ParsedMediaID) (*database.Message, error) {
-	lid, err := wa.DeviceStore.LIDMap.GetLIDForPN(ctx, parsedID.Message.Sender)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get LID for sender: %w", err)
-	} else if lid.IsEmpty() {
-		return nil, nil
-	}
-	return wa.Bridge.DB.Message.GetFirstPartByID(ctx, parsedID.UserLogin, waid.MakeMessageID(parsedID.Message.Chat, lid, parsedID.Message.ID))
-}
-
 func (wa *WhatsAppConnector) makeDirectMediaResponse(
 	ctx context.Context,
 	waClient *WhatsAppClient,
@@ -298,11 +255,10 @@ func (wa *WhatsAppConnector) makeDirectMediaResponse(
 
 type directMediaRetry struct {
 	sync.Mutex
-	resultURL   string
+	resultURL  string
-	wait        *exsync.Event
+	wait       *exsync.Event
-	requested   bool
+	requested  bool
-	resultType  waMmsRetry.MediaRetryNotification_ResultType
+	resultType waMmsRetry.MediaRetryNotification_ResultType
-	decryptFail bool
 }
 
 func (wa *WhatsAppClient) getDirectMediaRetryState(msgID networkid.MessageID, create bool) *directMediaRetry {
@@ -329,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.")
@@ -385,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 {

pkg/connector/errors.go

@@ -1,156 +0,0 @@
-// mautrix-whatsapp - A Matrix-WhatsApp puppeting bridge.
-// Copyright (C) 2026 Tulir Asokan
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package connector
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"go.mau.fi/whatsmeow"
-	"maunium.net/go/mautrix"
-	"maunium.net/go/mautrix/bridgev2"
-	"maunium.net/go/mautrix/event"
-
-	"go.mau.fi/mautrix-whatsapp/pkg/waid"
-)
-
-// wrapConversionError turns a failure to convert a Matrix event into a message status. Nothing has been
-// sent to WhatsApp at that point, so the failure is certain.
-func wrapConversionError(err error) error {
-	if err == nil || errors.As(err, &bridgev2.MessageStatus{}) {
-		return err
-	}
-	return bridgev2.WrapErrorInStatus(err).
-		WithMessage("failed to convert message for WhatsApp").
-		WithIsCertain(true).
-		WithSendNotice(true)
-}
-
-// wrapWhatsAppError turns an error from a whatsmeow request made while handling a Matrix event into a
-// message status.
-func wrapWhatsAppError(err error) error {
-	if err == nil || errors.As(err, &bridgev2.MessageStatus{}) {
-		return err
-	}
-	var iqErr *whatsmeow.IQError
-	var disconnectErr *whatsmeow.DisconnectedError
-	switch {
-	case errors.Is(err, whatsmeow.ErrNotConnected), errors.Is(err, whatsmeow.ErrClientIsNil):
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("not connected to WhatsApp").
-			WithIsCertain(true).
-			WithSendNotice(true)
-	case errors.Is(err, whatsmeow.ErrMessageTimedOut), errors.Is(err, whatsmeow.ErrIQTimedOut),
-		errors.Is(err, context.DeadlineExceeded), errors.As(err, &disconnectErr):
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("no response from WhatsApp").
-			WithIsCertain(false).
-			WithSendNotice(true)
-	case errors.Is(err, whatsmeow.ErrIQRateOverLimit):
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("rate limited by WhatsApp").
-			WithErrorReason(event.MessageStatusNetworkError).
-			WithIsCertain(true).
-			WithSendNotice(true)
-	case errors.Is(err, whatsmeow.ErrIQForbidden), errors.Is(err, whatsmeow.ErrIQNotAuthorized):
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("you don't have permission to do that on WhatsApp").
-			WithErrorReason(event.MessageStatusNoPermission).
-			WithStatus(event.MessageStatusFail).
-			WithIsCertain(true).
-			WithSendNotice(true)
-	case errors.Is(err, whatsmeow.ErrServerReturnedError), errors.As(err, &iqErr):
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("WhatsApp returned an error").
-			WithIsCertain(true).
-			WithSendNotice(true)
-	default:
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("unexpected error from WhatsApp").
-			WithSendNotice(true)
-	}
-}
-
-// wrapSendError turns an error from sending a message to WhatsApp into a message status.
-func (wa *WhatsAppClient) wrapSendError(err error) error {
-	switch sendErrorCode(err) {
-	case 403:
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("you don't have permission to do that on WhatsApp").
-			WithErrorReason(event.MessageStatusNoPermission).
-			WithStatus(event.MessageStatusFail).
-			WithIsCertain(true).
-			WithSendNotice(true)
-	case 463:
-		msg := "WhatsApp has temporarily restricted your account from messaging new contacts"
-		if until := wa.UserLogin.Metadata.(*waid.UserLoginMetadata).ReachoutTimelockUntil; until.After(time.Now()) {
-			msg = fmt.Sprintf("WhatsApp has restricted your account from messaging new contacts until %s", until.UTC().Format("Jan 2, 2006 at 3:04 PM MST"))
-		}
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage(msg).
-			WithErrorReason(event.MessageStatusNoPermission).
-			WithStatus(event.MessageStatusFail).
-			WithIsCertain(true).
-			WithSendNotice(true)
-	case 421, 479:
-		return bridgev2.WrapErrorInStatus(err).
-			WithMessage("WhatsApp rejected the message").
-			WithErrorReason(event.MessageStatusNetworkError).
-			WithStatus(event.MessageStatusFail).
-			WithIsCertain(true).
-			WithSendNotice(true)
-	default:
-		return wrapWhatsAppError(err)
-	}
-}
-
-// sendErrorCode returns the code WhatsApp rejected a message with, which whatsmeow only includes in the
-// error text.
-func sendErrorCode(err error) int {
-	if !errors.Is(err, whatsmeow.ErrServerReturnedError) {
-		return 0
-	}
-	_, codeStr, _ := strings.Cut(err.Error(), whatsmeow.ErrServerReturnedError.Error()+" ")
-	code, _ := strconv.Atoi(codeStr)
-	return code
-}
-
-// wrapWhatsAppRespError turns an error from a whatsmeow request made during login or provisioning into
-// an HTTP error, keeping the original error in the chain. Clients retry 429 and 502-504 automatically,
-// which isn't wanted for provisioning requests, so those statuses aren't used.
-func wrapWhatsAppRespError(err error) error {
-	var mapped bridgev2.RespError
-	var disconnectErr *whatsmeow.DisconnectedError
-	switch {
-	case errors.Is(err, whatsmeow.ErrIQRateOverLimit):
-		mapped = bridgev2.RespError(mautrix.MLimitExceeded.WithMessage("Rate limited by WhatsApp. Try again later.").WithStatus(http.StatusBadRequest))
-	case errors.Is(err, whatsmeow.ErrNotConnected), errors.Is(err, whatsmeow.ErrClientIsNil), errors.As(err, &disconnectErr):
-		mapped = bridgev2.RespError(mautrix.MUnknown.WithMessage("Not connected to WhatsApp"))
-	case errors.Is(err, whatsmeow.ErrIQTimedOut), errors.Is(err, context.DeadlineExceeded):
-		mapped = bridgev2.RespError(mautrix.MUnknown.WithMessage("WhatsApp didn't respond in time"))
-	case errors.Is(err, whatsmeow.ErrIQForbidden), errors.Is(err, whatsmeow.ErrIQNotAuthorized):
-		mapped = bridgev2.RespError(mautrix.MForbidden.WithMessage("WhatsApp denied the request"))
-	default:
-		mapped = bridgev2.RespError(mautrix.MUnknown.WithMessage("Request to WhatsApp failed"))
-	}
-	return fmt.Errorf("%w: %w", mapped.WithInternalError(err), err)
-}

pkg/connector/events.go

@@ -136,9 +136,6 @@ func (evt *WAMessageEvent) AddLogContext(c zerolog.Context) zerolog.Context {
 	if targetMsg := evt.GetTargetMessage(); targetMsg != "" {
 		c = c.Str("target_message_id", string(targetMsg))
 	}
-	if evt.parsedMessageType == "edit" {
-		c = c.Str("edit_inner_message_type", getMessageType(evt.Message.GetProtocolMessage().GetEditedMessage()))
-	}
 	return evt.MessageInfoWrapper.AddLogContext(c).Str("parsed_message_type", evt.parsedMessageType)
 }
 
@@ -192,49 +189,18 @@ func (evt *WAMessageEvent) ConvertEdit(ctx context.Context, portal *bridgev2.Por
 		cacheMessage = evt.GetID()
 	} else {
 		editedMsg = evt.Message.GetProtocolMessage().GetEditedMessage()
-		if editedMsg.GetLottieStickerMessage().GetMessage() != nil {
+		previouslyConvertedPart = evt.wa.Main.GetMediaEditCache(portal, targetMessage)
-			editedMsg = editedMsg.GetLottieStickerMessage().GetMessage()
-		}
-		if editedMsg.GetDocumentWithCaptionMessage().GetMessage() != nil {
-			editedMsg = editedMsg.GetDocumentWithCaptionMessage().GetMessage()
-		}
 		meta := existing[0].Metadata.(*waid.MessageMetadata)
 		if slices.Contains(meta.Edits, evt.Info.ID) {
 			return nil, fmt.Errorf("%w: edit already handled", bridgev2.ErrIgnoringRemoteEvent)
 		}
 		meta.Edits = append(meta.Edits, evt.Info.ID)
-		previouslyConvertedPart = evt.wa.Main.GetMediaEditCache(portal, targetMessage)
-		if previouslyConvertedPart == nil && needsPreviousEditPart(editedMsg) {
-			editedEvent, err := evt.wa.Main.Bridge.Bot.GetEvent(ctx, portal.MXID, existing[0].MXID)
-			if err != nil {
-				zerolog.Ctx(ctx).Err(err).Msg("Failed to fetch existing event for edit")
-			} else if editedEvent != nil && editedEvent.Content.AsMessage().MsgType != "" {
-				zerolog.Ctx(ctx).Debug().Msg("Fetched existing edit from server for caption edit")
-				copiedExtra := make(map[string]any)
-				for _, key := range []string{"info", msgconv.FailedMediaField} {
-					val, ok := editedEvent.Content.Raw[key]
-					if ok {
-						copiedExtra[key] = val
-					}
-				}
-				previouslyConvertedPart = &bridgev2.ConvertedMessagePart{
-					ID:         existing[0].PartID,
-					Type:       editedEvent.Type,
-					Content:    editedEvent.Content.AsMessage(),
-					Extra:      copiedExtra,
-					DBMetadata: meta,
-				}
-			} else {
-				zerolog.Ctx(ctx).Debug().Msg("Didn't find existing edit on server for caption edit")
-			}
-		}
 	}
 
 	ctx = context.WithValue(ctx, msgconv.ContextKeyEditTargetID, evt.Message.GetProtocolMessage().GetKey().GetID())
 	cm := evt.wa.Main.MsgConv.ToMatrix(
 		ctx, portal, evt.wa.Client, intent, editedMsg, evt.MsgEvent.RawMessage, &evt.Info, evt.isViewOnce(), false, previouslyConvertedPart,
 	)
-	evt.addMuseProfile(portal, cm)
 	if evt.isUndecryptableUpsertSubEvent && isFailedMedia(cm) {
 		evt.postHandle = func() {
 			evt.wa.processFailedMedia(ctx, portal.PortalKey, evt.GetID(), cm, false)
@@ -315,30 +281,11 @@ func (evt *WAMessageEvent) HandleExisting(ctx context.Context, portal *bridgev2.
 	return bridgev2.UpsertResult{}, nil
 }
 
-func (evt *WAMessageEvent) addMuseProfile(portal *bridgev2.Portal, converted *bridgev2.ConvertedMessage) {
-	if evt.Info.Chat != types.MuseJID || evt.Info.IsFromMe || !portal.NameIsCustom {
-		return
-	}
-	profile := &event.BeeperPerMessageProfile{
-		ID:          string(portal.MXID),
-		Displayname: portal.Name,
-	}
-	if portal.AvatarMXC != "" {
-		profile.AvatarURL = &portal.AvatarMXC
-	}
-	for _, part := range converted.Parts {
-		if part.Content != nil {
-			part.Content.BeeperPerMessageProfile = profile
-		}
-	}
-}
-
 func (evt *WAMessageEvent) ConvertMessage(ctx context.Context, portal *bridgev2.Portal, intent bridgev2.MatrixAPI) (*bridgev2.ConvertedMessage, error) {
 	evt.wa.EnqueuePortalResync(portal, false)
 	converted := evt.wa.Main.MsgConv.ToMatrix(
 		ctx, portal, evt.wa.Client, intent, evt.Message, evt.MsgEvent.RawMessage, &evt.Info, evt.isViewOnce(), false, nil,
 	)
-	evt.addMuseProfile(portal, converted)
 	if isFailedMedia(converted) {
 		evt.postHandle = func() {
 			evt.wa.processFailedMedia(ctx, portal.PortalKey, evt.GetID(), converted, false)
@@ -368,10 +315,7 @@ func (evt *WANowDecryptableMessage) GetTargetMessage() networkid.MessageID {
 }
 
 func (evt *WANowDecryptableMessage) AddLogContext(c zerolog.Context) zerolog.Context {
-	if evt.editParts != nil {
+	return c
-		return c.Bool("from_upsert", true)
-	}
-	return evt.WAMessageEvent.AddLogContext(c.Bool("from_upsert", false))
 }
 
 func (evt *WANowDecryptableMessage) GetType() bridgev2.RemoteEventType {
@@ -469,14 +413,24 @@ func (evt *WAMediaRetry) AddLogContext(c zerolog.Context) zerolog.Context {
 }
 
 func (evt *WAMediaRetry) getRealSender() types.JID {
-	return evt.wa.getRealSender(evt.ChatID, evt.SenderID, evt.FromMe)
+	sender := evt.SenderID
+	if sender.IsEmpty() {
+		if evt.FromMe {
+			if evt.ChatID.Server == types.HiddenUserServer {
+				sender = evt.wa.GetLID().ToNonAD()
+			} else {
+				sender = evt.wa.JID.ToNonAD()
+			}
+		} else if evt.ChatID.Server == types.DefaultUserServer || evt.ChatID.Server == types.HiddenUserServer || evt.ChatID.Server == types.BotServer {
+			sender = evt.ChatID.ToNonAD()
+		}
+	}
+	return sender
 }
 
 func (evt *WAMediaRetry) GetSender() bridgev2.EventSender {
 	realSender := pickLID(evt.getRealSender(), evt.senderLID)
-	sender := evt.wa.makeEventSender(evt.wa.Main.Bridge.BackgroundCtx, realSender)
+	return evt.wa.makeEventSender(evt.wa.Main.Bridge.BackgroundCtx, realSender)
-	sender.ForceEditOrigSender = true
-	return sender
 }
 
 func (evt *WAMediaRetry) GetTargetMessage() networkid.MessageID {
@@ -541,7 +495,6 @@ func (evt *WAMediaRetry) ConvertEdit(ctx context.Context, portal *bridgev2.Porta
 			log.Debug().Msg("Got error response in media retry notification, but response also contains a new download URL - trying to download")
 		}
 	}
-	log.Trace().Any("retry_content", retryData).Msg("Decrypted successful media retry response")
 	err = evt.wa.mediaRetryLock.Acquire(ctx, 1)
 	if err != nil {
 		return nil, fmt.Errorf("failed to acquire media retry lock: %w", err)

pkg/connector/example-config.yaml

@@ -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:

pkg/connector/handlematrix.go

@@ -1,19 +1,3 @@
-// mautrix-whatsapp - A Matrix-WhatsApp puppeting bridge.
-// Copyright (C) 2026 Tulir Asokan
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
 package connector
 
 import (
@@ -35,7 +19,6 @@ import (
 	"go.mau.fi/whatsmeow/proto/waCommon"
 	"go.mau.fi/whatsmeow/proto/waE2E"
 	"go.mau.fi/whatsmeow/types"
-	"go.mau.fi/whatsmeow/types/events"
 	"golang.org/x/image/draw"
 	"google.golang.org/protobuf/proto"
 	"maunium.net/go/mautrix/bridgev2"
@@ -63,13 +46,12 @@ var (
 	_ bridgev2.TagHandlingNetworkAPI            = (*WhatsAppClient)(nil)
 	_ bridgev2.MarkedUnreadHandlingNetworkAPI   = (*WhatsAppClient)(nil)
 	_ bridgev2.DeleteChatHandlingNetworkAPI     = (*WhatsAppClient)(nil)
-	_ bridgev2.UserBlockingNetworkAPI           = (*WhatsAppClient)(nil)
 )
 
 func (wa *WhatsAppClient) HandleMatrixPollStart(ctx context.Context, msg *bridgev2.MatrixPollStart) (result *bridgev2.MatrixMessageResponse, retErr error) {
 	waMsg, optionMap, err := wa.Main.MsgConv.PollStartToWhatsApp(ctx, msg.Content, msg.ReplyTo, msg.Portal)
 	if err != nil {
-		return nil, wrapConversionError(fmt.Errorf("failed to convert poll start: %w", err))
+		return nil, fmt.Errorf("failed to convert poll vote: %w", err)
 	}
 	defer wa.mcTrack(msg, time.Now(), &retErr)
 	resp, err := wa.handleConvertedMatrixMessage(ctx, &msg.MatrixMessage, waMsg, nil)
@@ -89,7 +71,7 @@ func (wa *WhatsAppClient) HandleMatrixPollStart(ctx context.Context, msg *bridge
 func (wa *WhatsAppClient) HandleMatrixPollVote(ctx context.Context, msg *bridgev2.MatrixPollVote) (result *bridgev2.MatrixMessageResponse, retErr error) {
 	waMsg, err := wa.Main.MsgConv.PollVoteToWhatsApp(ctx, wa.Client, msg.Content, msg.VoteTo)
 	if err != nil {
-		return nil, wrapConversionError(fmt.Errorf("failed to convert poll vote: %w", err))
+		return nil, fmt.Errorf("failed to convert poll vote: %w", err)
 	}
 	defer wa.mcTrack(msg, time.Now(), &retErr)
 	return wa.handleConvertedMatrixMessage(ctx, &msg.MatrixMessage, waMsg, nil)
@@ -98,17 +80,14 @@ func (wa *WhatsAppClient) HandleMatrixPollVote(ctx context.Context, msg *bridgev
 func (wa *WhatsAppClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.MatrixMessage) (result *bridgev2.MatrixMessageResponse, retErr error) {
 	waMsg, req, err := wa.Main.MsgConv.ToWhatsApp(ctx, wa.Client, msg.Event, msg.Content, msg.ReplyTo, msg.ThreadRoot, msg.Portal)
 	if err != nil {
-		return nil, wrapConversionError(fmt.Errorf("failed to convert message: %w", err))
+		return nil, fmt.Errorf("failed to convert message: %w", err)
 	}
 	defer wa.mcTrack(msg, time.Now(), &retErr)
 	return wa.handleConvertedMatrixMessage(ctx, msg, waMsg, req)
 }
 
-var ErrBroadcastSendDisabled = bridgev2.WrapErrorInStatus(errors.New("sending status messages is disabled")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true).WithErrorReason(event.MessageStatusUnsupported).WithStatus(event.MessageStatusFail)
+var ErrBroadcastSendDisabled = bridgev2.WrapErrorInStatus(errors.New("sending status messages is disabled")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true).WithErrorReason(event.MessageStatusUnsupported)
-var ErrBroadcastReactionUnsupported = bridgev2.WrapErrorInStatus(errors.New("reacting to status messages is not currently supported")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true).WithErrorReason(event.MessageStatusUnsupported).WithStatus(event.MessageStatusFail)
+var ErrBroadcastReactionUnsupported = bridgev2.WrapErrorInStatus(errors.New("reacting to status messages is not currently supported")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true).WithErrorReason(event.MessageStatusUnsupported)
-var ErrNotCommunityAdmin = bridgev2.WrapErrorInStatus(errors.New("only community admins can send announcements")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true).WithErrorReason(event.MessageStatusNoPermission).WithStatus(event.MessageStatusFail)
-var ErrEmptyGroupName = bridgev2.WrapErrorInStatus(errors.New("WhatsApp group names can't be empty")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true).WithErrorReason(event.MessageStatusUnsupported).WithStatus(event.MessageStatusFail)
-var ErrAddBlockedByPrivacy = bridgev2.WrapErrorInStatus(errors.New("this user's privacy settings don't allow adding them to groups")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true).WithErrorReason(event.MessageStatusNoPermission).WithStatus(event.MessageStatusFail)
 
 func (wa *WhatsAppClient) handleConvertedMatrixMessage(ctx context.Context, msg *bridgev2.MatrixMessage, waMsg *waE2E.Message, req *whatsmeow.SendRequestExtra) (*bridgev2.MatrixMessageResponse, error) {
 	if req == nil {
@@ -119,7 +98,6 @@ func (wa *WhatsAppClient) handleConvertedMatrixMessage(ctx context.Context, msg
 	} else {
 		req.ID = wa.Client.GenerateMessageID()
 	}
-	req.CheckPermissions = true
 
 	chatJID, err := waid.ParsePortalID(msg.Portal.ID)
 	if err != nil {
@@ -138,10 +116,7 @@ func (wa *WhatsAppClient) handleConvertedMatrixMessage(ctx context.Context, msg
 	zerolog.Ctx(ctx).Trace().Any("payload", waMsg).Msg("Outgoing message payload")
 	resp, err := wa.Client.SendMessage(ctx, chatJID, waMsg, *req)
 	if err != nil {
-		if errors.Is(err, whatsmeow.ErrNoPermissionInGroup) {
+		return nil, err
-			return nil, ErrNotCommunityAdmin
-		}
-		return nil, wa.wrapSendError(err)
 	}
 	var pickedMessageID networkid.MessageID
 	if resp.Sender == wa.GetLID() {
@@ -206,7 +181,7 @@ func (wa *WhatsAppClient) HandleMatrixReaction(ctx context.Context, msg *bridgev
 	if msg.Portal.Metadata.(*waid.PortalMetadata).CommunityAnnouncementGroup {
 		reactionMsg.EncReactionMessage, err = wa.Client.EncryptReaction(ctx, msgconv.MessageIDToInfo(ctx, wa.Client, messageID), reactionMsg.ReactionMessage)
 		if err != nil {
-			return nil, wrapWhatsAppError(fmt.Errorf("failed to encrypt reaction: %w", err))
+			return nil, fmt.Errorf("failed to encrypt reaction: %w", err)
 		}
 		reactionMsg.ReactionMessage = nil
 		req.Meta = &types.MsgMetaInfo{
@@ -220,7 +195,7 @@ func (wa *WhatsAppClient) HandleMatrixReaction(ctx context.Context, msg *bridgev
 		Metadata: &waid.ReactionMetadata{
 			SenderDeviceID: wa.JID.Device,
 		},
-	}, wa.wrapSendError(err)
+	}, err
 }
 
 func (wa *WhatsAppClient) HandleMatrixReactionRemove(ctx context.Context, msg *bridgev2.MatrixReactionRemove) (retErr error) {
@@ -250,7 +225,7 @@ func (wa *WhatsAppClient) HandleMatrixReactionRemove(ctx context.Context, msg *b
 	defer wa.mcTrack(msg, time.Now(), &retErr)
 	resp, err := wa.Client.SendMessage(ctx, portalJID, reactionMsg, extra)
 	zerolog.Ctx(ctx).Trace().Any("response", resp).Msg("WhatsApp reaction response")
-	return wa.wrapSendError(err)
+	return err
 }
 
 func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.MatrixEdit) (retErr error) {
@@ -275,7 +250,7 @@ func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.M
 
 	waMsg, _, err := wa.Main.MsgConv.ToWhatsApp(ctx, wa.Client, edit.Event, edit.Content, nil, nil, edit.Portal)
 	if err != nil {
-		return wrapConversionError(fmt.Errorf("failed to convert message: %w", err))
+		return fmt.Errorf("failed to convert message: %w", err)
 	}
 	defer wa.mcTrack(edit, time.Now(), &retErr)
 
@@ -290,7 +265,7 @@ func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.M
 		ID: editID,
 	})
 	log.Trace().Any("response", resp).Msg("WhatsApp edit response")
-	return wa.wrapSendError(err)
+	return err
 }
 
 func (wa *WhatsAppClient) HandleMatrixMessageRemove(ctx context.Context, msg *bridgev2.MatrixMessageRemove) (retErr error) {
@@ -315,11 +290,11 @@ func (wa *WhatsAppClient) HandleMatrixMessageRemove(ctx context.Context, msg *br
 
 	resp, err := wa.Client.SendMessage(ctx, portalJID, revokeMessage, extra)
 	log.Trace().Any("response", resp).Msg("WhatsApp delete response")
-	return wa.wrapSendError(err)
+	return err
 }
 
 func (wa *WhatsAppClient) HandleMatrixReadReceipt(ctx context.Context, receipt *bridgev2.MatrixReadReceipt) (retErr error) {
-	if receipt.Receipt.IsThread() || !receipt.ReadUpTo.After(receipt.LastRead) {
+	if !receipt.ReadUpTo.After(receipt.LastRead) {
 		return nil
 	}
 	if receipt.LastRead.IsZero() {
@@ -364,7 +339,7 @@ func (wa *WhatsAppClient) HandleMatrixReadReceipt(ctx context.Context, receipt *
 			log.Err(err).Strs("ids", ids).Msg("Failed to mark messages as read")
 		}
 	}
-	return wrapWhatsAppError(err)
+	return err
 }
 
 func (wa *WhatsAppClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.MatrixTyping) (retErr error) {
@@ -395,7 +370,7 @@ func (wa *WhatsAppClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.
 			zerolog.Ctx(ctx).Warn().Err(err).Msg("Failed to set presence on typing")
 		}
 	}
-	return wrapWhatsAppError(wa.Client.SendChatPresence(ctx, portalJID, chatPresence, mediaPresence))
+	return wa.Client.SendChatPresence(ctx, portalJID, chatPresence, mediaPresence)
 }
 
 var errUnsupportedDisappearingTimer = bridgev2.WrapErrorInStatus(errors.New("invalid value for disappearing timer")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true)
@@ -416,7 +391,7 @@ func (wa *WhatsAppClient) HandleMatrixDisappearingTimer(ctx context.Context, msg
 	settingTS := time.UnixMilli(msg.Event.Timestamp)
 	err = wa.Client.SetDisappearingTimer(ctx, portalJID, msg.Content.Timer.Duration, settingTS)
 	if err != nil {
-		return false, wrapWhatsAppError(err)
+		return false, err
 	}
 	msg.Portal.Metadata.(*waid.PortalMetadata).DisappearingTimerSetAt = settingTS.Unix()
 	msg.Portal.Disappear = database.DisappearingSetting{
@@ -446,12 +421,6 @@ func (wa *WhatsAppClient) HandleMatrixMembership(ctx context.Context, msg *bridg
 		default:
 			return nil, nil
 		}
-	} else if portalJID.Server == types.NewsletterServer {
-		if msg.Type != bridgev2.Leave {
-			return nil, fmt.Errorf("cannot change channel members")
-		}
-		defer wa.mcTrack(msg, time.Now(), &retErr)
-		return nil, wrapWhatsAppError(wa.Client.UnfollowNewsletter(ctx, portalJID))
 	}
 
 	changes := make([]types.JID, 1)
@@ -482,11 +451,9 @@ func (wa *WhatsAppClient) HandleMatrixMembership(ctx context.Context, msg *bridg
 	defer wa.mcTrack(msg, time.Now(), &retErr)
 	resp, err := wa.Client.UpdateGroupParticipants(ctx, portalJID, changes, action)
 	if err != nil {
-		return nil, wrapWhatsAppError(err)
+		return nil, err
 	} else if len(resp) == 0 {
 		return nil, fmt.Errorf("no response for participant change")
-	} else if resp[0].Error == 403 && action == whatsmeow.ParticipantChangeAdd {
-		return nil, ErrAddBlockedByPrivacy
 	} else if resp[0].Error != 0 {
 		return nil, fmt.Errorf("failed to change participant: code %d", resp[0].Error)
 	}
@@ -505,14 +472,12 @@ func (wa *WhatsAppClient) HandleMatrixRoomName(ctx context.Context, msg *bridgev
 
 	if msg.Portal.RoomType == database.RoomTypeDM {
 		return false, fmt.Errorf("cannot set room name for DM")
-	} else if msg.Content.Name == "" {
-		return false, ErrEmptyGroupName
 	}
 
 	defer wa.mcTrack(msg, time.Now(), &retErr)
 	err = wa.Client.SetGroupName(ctx, portalJID, msg.Content.Name)
 	if err != nil {
-		return false, wrapWhatsAppError(err)
+		return false, err
 	}
 
 	msg.Portal.Name = msg.Content.Name
@@ -536,7 +501,7 @@ func (wa *WhatsAppClient) HandleMatrixRoomTopic(ctx context.Context, msg *bridge
 	oldID := msg.Portal.Metadata.(*waid.PortalMetadata).TopicID
 	err = wa.Client.SetGroupTopic(ctx, portalJID, oldID, newID, msg.Content.Topic)
 	if err != nil {
-		return false, wrapWhatsAppError(err)
+		return false, err
 	}
 
 	msg.Portal.Topic = msg.Content.Topic
@@ -572,7 +537,7 @@ func (wa *WhatsAppClient) HandleMatrixRoomAvatar(ctx context.Context, msg *bridg
 	defer wa.mcTrack(msg, time.Now(), &retErr)
 	avatarID, err := wa.Client.SetGroupPhoto(ctx, portalJID, data)
 	if err != nil {
-		return false, wrapWhatsAppError(err)
+		return false, err
 	}
 
 	msg.Portal.AvatarMXC = msg.Content.URL
@@ -601,7 +566,7 @@ func convertRoomAvatar(data []byte) ([]byte, error) {
 	if isCorrectSize && imageType == "jpeg" {
 		return data, nil
 	} else if len(data) > 10*1024*1024 || width > 12000 || height > 12000 {
-		return nil, fmt.Errorf("%w: avatar is too large for re-encoding", bridgev2.ErrMediaTooLarge)
+		return nil, fmt.Errorf("avatar is too large for re-encoding")
 	}
 
 	img, _, err := image.Decode(bytes.NewReader(data))
@@ -707,10 +672,7 @@ func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridg
 	if err != nil {
 		return err
 	}
-	if chatJID.Server == types.NewsletterServer {
+	if chatJID.Server == types.GroupServer {
-		defer wa.mcTrack(msg, time.Now(), &retErr)
-		return wrapWhatsAppError(wa.Client.UnfollowNewsletter(ctx, chatJID))
-	} else if chatJID.Server == types.GroupServer {
 		memberInfo, err := wa.Main.Bridge.Matrix.GetMemberInfo(ctx, msg.Portal.MXID, wa.UserLogin.UserMXID)
 		if err != nil {
 			return fmt.Errorf("failed to get own member info: %w", err)
@@ -718,7 +680,7 @@ func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridg
 			err = wa.Client.LeaveGroup(ctx, chatJID)
 			if err != nil {
 				// TODO ignore errors saying you already left the group?
-				return wrapWhatsAppError(fmt.Errorf("failed to leave group before deleting chat: %w", err))
+				return fmt.Errorf("failed to leave group before deleting chat: %w", err)
 			}
 		}
 	}
@@ -727,37 +689,5 @@ func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridg
 		return err
 	}
 	defer wa.mcTrack(msg, time.Now(), &retErr)
-	return wrapWhatsAppError(wa.Client.SendAppState(ctx, appstate.BuildDeleteChat(chatJID, lastTS, lastKey, true)))
+	return wa.Client.SendAppState(ctx, appstate.BuildDeleteChat(chatJID, lastTS, lastKey, true))
-}
-
-func (wa *WhatsAppClient) HandleMatrixBlockUser(ctx context.Context, msg *bridgev2.MatrixBlockUser) error {
-	if wa.Client == nil {
-		return bridgev2.ErrNotLoggedIn
-	}
-	jid, err := waid.ParsePortalID(msg.Portal.ID)
-	if err != nil {
-		return err
-	}
-	if msg.Content.ReportSpam {
-		return bridgev2.WrapErrorInStatus(errors.New("reporting spam is not supported on WhatsApp")).WithIsCertain(true).WithErrorAsMessage().WithErrorReason(event.MessageStatusUnsupported).WithStatus(event.MessageStatusFail)
-	}
-	action := events.BlocklistChangeActionUnblock
-	if msg.Content.Block {
-		action = events.BlocklistChangeActionBlock
-	}
-	blocklist, err := wa.Client.UpdateBlocklist(ctx, jid, action, "")
-	if err == nil {
-		wa.blocklistLock.Lock()
-		defer wa.blocklistLock.Unlock()
-		evts := wa.saveBlocklistUnlocked(ctx, blocklist)
-		go func() {
-			for _, evt := range evts {
-				if evt.PortalKey == msg.Portal.PortalKey {
-					continue
-				}
-				wa.UserLogin.QueueRemoteEvent(evt)
-			}
-		}()
-	}
-	return wrapWhatsAppError(err)
 }