diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 3703df9..4b3b934 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -7,10 +7,12 @@ type: Bug
---
-
-It's always best to ask in the Matrix room first, especially if you aren't sure
-what details are needed. Issues with insufficient detail will likely just be
-ignored or closed immediately.
--->
+### Checklist
+
+
+
+* [ ] This is an actual bug, not just a setup issue (see the [troubleshooting docs](https://docs.mau.fi/bridges/general/troubleshooting.html) or ask in the Matrix room for setup help).
+* [ ] I am certain that sufficient information is included. Ask in the Matrix room first if not.
+* [ ] The bug is still present on the main branch. The `!wa version` command output is: ``
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3cefd6d..560e2b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+# v26.06
+
+* Added placeholder for group message history share notices.
+* Fixed community spaces not being bridged properly in some cases.
+* Fixed handling edits of HD media.
+* Fixed duplicate message when a message from another own device is initially
+ undecryptable and later gets resolved.
+
+# v26.05
+
+* Added support for importing sticker packs from WhatsApp.
+* Added support for WhatsApp's new message edit encryption scheme.
+
+# v26.04
+
+* Added support for @room mentions in both directions.
+* Changed initial backfill to happen even if WhatsApp doesn't send full history.
+* Fixed panic when handling updates to unknown polls from WhatsApp.
+* Fixed some background loops not stopping when a user is logged out.
+
# v26.03
* Added option to save outgoing messages in the database to allow encryption
diff --git a/cmd/mautrix-whatsapp/legacyprovision.go b/cmd/mautrix-whatsapp/legacyprovision.go
deleted file mode 100644
index f0527b2..0000000
--- a/cmd/mautrix-whatsapp/legacyprovision.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package main
-
-import (
- "net/http"
- "strings"
-
- "github.com/rs/zerolog/hlog"
- "go.mau.fi/util/exhttp"
- "go.mau.fi/whatsmeow"
- "go.mau.fi/whatsmeow/appstate"
- "go.mau.fi/whatsmeow/types"
- "maunium.net/go/mautrix"
- "maunium.net/go/mautrix/bridgev2"
- "maunium.net/go/mautrix/bridgev2/matrix"
- "maunium.net/go/mautrix/id"
-
- "go.mau.fi/mautrix-whatsapp/pkg/connector"
- "go.mau.fi/mautrix-whatsapp/pkg/waid"
-)
-
-type OtherUserInfo struct {
- MXID id.UserID `json:"mxid"`
- JID types.JID `json:"jid"`
- Name string `json:"displayname"`
- Avatar id.ContentURIString `json:"avatar_url"`
-}
-
-type PortalInfo struct {
- RoomID id.RoomID `json:"room_id"`
- OtherUser *OtherUserInfo `json:"other_user,omitempty"`
- GroupInfo *types.GroupInfo `json:"group_info,omitempty"`
- JustCreated bool `json:"just_created"`
-}
-
-type Error struct {
- Success bool `json:"success"`
- Error string `json:"error"`
- ErrCode string `json:"errcode"`
-}
-
-func legacyProvContacts(w http.ResponseWriter, r *http.Request) {
- userLogin := m.Matrix.Provisioning.GetLoginForRequest(w, r)
- if userLogin == nil {
- return
- }
- if contacts, err := userLogin.Client.(*connector.WhatsAppClient).GetStore().Contacts.GetAllContacts(r.Context()); err != nil {
- hlog.FromRequest(r).Err(err).Msg("Failed to fetch all contacts")
- exhttp.WriteJSONResponse(w, http.StatusInternalServerError, Error{
- Error: "Internal server error while fetching contact list",
- ErrCode: "failed to get contacts",
- })
- } else {
- augmentedContacts := map[types.JID]any{}
- for jid, contact := range contacts {
- var avatarURL id.ContentURIString
- if puppet, _ := m.Bridge.GetExistingGhostByID(r.Context(), waid.MakeUserID(jid)); puppet != nil {
- avatarURL = puppet.AvatarMXC
- }
- augmentedContacts[jid] = map[string]interface{}{
- "Found": contact.Found,
- "FirstName": contact.FirstName,
- "FullName": contact.FullName,
- "PushName": contact.PushName,
- "BusinessName": contact.BusinessName,
- "AvatarURL": avatarURL,
- }
- }
- exhttp.WriteJSONResponse(w, http.StatusOK, augmentedContacts)
- }
-}
-
-func legacyProvResolveIdentifier(w http.ResponseWriter, r *http.Request) {
- number := r.PathValue("number")
- userLogin := m.Matrix.Provisioning.GetLoginForRequest(w, r)
- if userLogin == nil {
- return
- }
- startChat := strings.Contains(r.URL.Path, "/v1/pm/")
- resp, err := userLogin.Client.(*connector.WhatsAppClient).ResolveIdentifier(r.Context(), number, startChat)
- if err != nil {
- hlog.FromRequest(r).Warn().Err(err).Str("identifier", number).Msg("Failed to resolve identifier")
- matrix.RespondWithError(w, err, "Internal error resolving identifier")
- return
- }
- var portal *bridgev2.Portal
- if startChat {
- portal, err = m.Bridge.GetPortalByKey(r.Context(), resp.Chat.PortalKey)
- if err != nil {
- hlog.FromRequest(r).Warn().Err(err).Stringer("portal_key", resp.Chat.PortalKey).Msg("Failed to get portal by key")
- matrix.RespondWithError(w, err, "Internal error getting portal by key")
- return
- }
- err = portal.CreateMatrixRoom(r.Context(), userLogin, nil)
- if err != nil {
- hlog.FromRequest(r).Warn().Err(err).Stringer("portal_key", resp.Chat.PortalKey).Msg("Failed to create matrix room for portal")
- matrix.RespondWithError(w, err, "Internal error creating matrix room for portal")
- return
- }
- } else {
- portal, _ = m.Bridge.GetExistingPortalByKey(r.Context(), resp.Chat.PortalKey)
- }
- var roomID id.RoomID
- if portal != nil {
- roomID = portal.MXID
- }
- exhttp.WriteJSONResponse(w, http.StatusOK, PortalInfo{
- RoomID: roomID,
- OtherUser: &OtherUserInfo{
- JID: waid.ParseUserID(resp.UserID),
- MXID: resp.Ghost.Intent.GetMXID(),
- Name: resp.Ghost.Name,
- Avatar: resp.Ghost.AvatarMXC,
- },
- })
-}
-
-func provAppStateDebug(w http.ResponseWriter, r *http.Request) {
- userLogin := m.Matrix.Provisioning.GetLoginForRequest(w, r)
- if userLogin == nil {
- return
- }
- client := userLogin.Client.(*connector.WhatsAppClient)
- if client.Client == nil {
- mautrix.MNotFound.WithMessage("WhatsApp client not connected").Write(w)
- return
- }
- client.Client.AppStateDebugLogs = true
- err := client.Client.FetchAppState(r.Context(), appstate.WAPatchName(r.PathValue("patch")), r.URL.Query().Get("full") == "1", false)
- client.Client.AppStateDebugLogs = false
- if err != nil {
- mautrix.MUnknown.WithMessage("Failed to fetch app state: %v", err).Write(w)
- } else {
- exhttp.WriteEmptyJSONResponse(w, http.StatusOK)
- }
-}
-
-func provRecoverAppStateDebug(w http.ResponseWriter, r *http.Request) {
- userLogin := m.Matrix.Provisioning.GetLoginForRequest(w, r)
- if userLogin == nil {
- return
- }
- client := userLogin.Client.(*connector.WhatsAppClient)
- if client.Client == nil {
- mautrix.MNotFound.WithMessage("WhatsApp client not connected").Write(w)
- return
- }
- resp, err := client.Client.SendPeerMessage(r.Context(), whatsmeow.BuildAppStateRecoveryRequest(appstate.WAPatchName(r.PathValue("patch"))))
- if err != nil {
- mautrix.MUnknown.WithMessage("Failed to send app state recovery request: %v", err).Write(w)
- } else {
- exhttp.WriteJSONResponse(w, http.StatusOK, resp)
- }
-}
diff --git a/cmd/mautrix-whatsapp/main.go b/cmd/mautrix-whatsapp/main.go
index e64f02f..07baaec 100644
--- a/cmd/mautrix-whatsapp/main.go
+++ b/cmd/mautrix-whatsapp/main.go
@@ -18,21 +18,12 @@ var m = mxmain.BridgeMain{
Name: "mautrix-whatsapp",
URL: "https://github.com/mautrix/whatsapp",
Description: "A Matrix-WhatsApp puppeting bridge.",
- Version: "26.03",
+ Version: "26.06",
SemCalVer: true,
Connector: &connector.WhatsAppConnector{},
}
func main() {
- m.PostStart = func() {
- if m.Matrix.Provisioning != nil {
- m.Matrix.Provisioning.Router.HandleFunc("GET /v1/contacts", legacyProvContacts)
- m.Matrix.Provisioning.Router.HandleFunc("GET /v1/resolve_identifier/{number}", legacyProvResolveIdentifier)
- m.Matrix.Provisioning.Router.HandleFunc("POST /v1/pm/{number}", legacyProvResolveIdentifier)
- m.Matrix.Provisioning.Router.HandleFunc("POST /v1/debug/appstate/{patch}", provAppStateDebug)
- m.Matrix.Provisioning.Router.HandleFunc("POST /v1/debug/recover-appstate/{patch}", provRecoverAppStateDebug)
- }
- }
m.InitVersion(Tag, Commit, BuildTime)
m.Run()
}
diff --git a/go.mod b/go.mod
index e8f8bb1..9dc2e58 100644
--- a/go.mod
+++ b/go.mod
@@ -2,52 +2,52 @@ module go.mau.fi/mautrix-whatsapp
go 1.25.0
-toolchain go1.26.1
+toolchain go1.26.4
tool go.mau.fi/util/cmd/maubuild
require (
- github.com/lib/pq v1.11.2
- github.com/rs/zerolog v1.34.0
- go.mau.fi/util v0.9.7
- go.mau.fi/webp v0.2.0
- go.mau.fi/whatsmeow v0.0.0-20260305215846-fc65416c22c4
- golang.org/x/image v0.37.0
- golang.org/x/net v0.52.0
- golang.org/x/sync v0.20.0
+ github.com/lib/pq v1.12.3
+ github.com/rs/zerolog v1.35.1
+ github.com/tidwall/gjson v1.19.0
+ go.mau.fi/util v0.9.10
+ go.mau.fi/webp v0.3.0
+ go.mau.fi/whatsmeow v0.0.0-20260630180629-b572e5bcb92b
+ golang.org/x/image v0.42.0
+ golang.org/x/net v0.56.0
+ golang.org/x/sync v0.21.0
google.golang.org/protobuf v1.36.11
gopkg.in/yaml.v3 v3.0.1
- maunium.net/go/mautrix v0.26.5-0.20260322102453-0c955c396df7
+ maunium.net/go/mautrix v0.28.2-0.20260702123919-bf2dbb2aa895
)
require (
filippo.io/edwards25519 v1.2.0 // indirect
github.com/beeper/argo-go v1.1.2 // indirect
- github.com/coder/websocket v1.8.14 // indirect
- github.com/coreos/go-systemd/v22 v22.6.0 // indirect
+ 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.34 // indirect
- github.com/petermattis/goid v0.0.0-20260226131333-17d1149c6ac6 // indirect
+ github.com/mattn/go-sqlite3 v1.14.45 // indirect
+ github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 // 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
- github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.2.0 // indirect
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.7.16 // indirect
- go.mau.fi/libsignal v0.2.1 // indirect
+ github.com/yuin/goldmark v1.8.2 // indirect
+ go.mau.fi/libsignal v0.2.2 // indirect
go.mau.fi/zeroconfig v0.2.0 // indirect
- golang.org/x/crypto v0.49.0 // indirect
- golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
- golang.org/x/mod v0.34.0 // indirect
- golang.org/x/sys v0.42.0 // indirect
- golang.org/x/text v0.35.0 // indirect
+ golang.org/x/crypto v0.53.0 // indirect
+ golang.org/x/exp v0.0.0-20260611194520-c48552f49976 // indirect
+ golang.org/x/mod v0.37.0 // indirect
+ golang.org/x/sys v0.46.0 // indirect
+ golang.org/x/text v0.38.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
diff --git a/go.sum b/go.sum
index 6fedc40..1d4b8af 100644
--- a/go.sum
+++ b/go.sum
@@ -8,17 +8,15 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNg
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/beeper/argo-go v1.1.2 h1:UQI2G8F+NLfGTOmTUI0254pGKx/HUU/etbUGTJv91Fs=
github.com/beeper/argo-go v1.1.2/go.mod h1:M+LJAnyowKVQ6Rdj6XYGEn+qcVFkb3R/MUpqkGR0hM4=
-github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
-github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
-github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
+github.com/coder/websocket v1.8.15 h1:6B2JPeOGlpff2Uz6vOEH1Vzpi0iUz20A+lPVhPHtNUA=
+github.com/coder/websocket v1.8.15/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
+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/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -30,21 +28,17 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lib/pq v1.11.2 h1:x6gxUeu39V0BHZiugWe8LXZYZ+Utk7hSJGThs8sdzfs=
-github.com/lib/pq v1.11.2/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/lib/pq v1.12.3 h1:tTWxr2YLKwIvK90ZXEw8GP7UFHtcbTtty8zsI+YjrfQ=
+github.com/lib/pq v1.12.3/go.mod h1:/p+8NSbOcwzAEI7wiMXFlgydTwcgTr3OSKMsD2BitpA=
github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
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.34 h1:3NtcvcUnFBPsuRcno8pUtupspG/GM+9nZ88zgJcp6Zk=
-github.com/mattn/go-sqlite3 v1.14.34/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/petermattis/goid v0.0.0-20260226131333-17d1149c6ac6 h1:rh2lKw/P/EqHa724vYH2+VVQ1YnW4u6EOXl0PMAovZE=
-github.com/petermattis/goid v0.0.0-20260226131333-17d1149c6ac6/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
+github.com/mattn/go-sqlite3 v1.14.45 h1:6KA/spDguL3KV8rnybG7ezSaE4SeMR3KC9VbUoAQaIk=
+github.com/mattn/go-sqlite3 v1.14.45/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ=
+github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 h1:WDsQxOJDy0N1VRAjXLpi8sCEZRSGarLWQevDxpTBRrM=
+github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
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=
@@ -52,8 +46,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
-github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
-github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
+github.com/rs/zerolog v1.35.1 h1:m7xQeoiLIiV0BCEY4Hs+j2NG4Gp2o2KPKmhnnLiazKI=
+github.com/rs/zerolog v1.35.1/go.mod h1:EjML9kdfa/RMA7h/6z6pYmq1ykOuA8/mjWaEvGI+jcw=
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=
@@ -61,8 +55,8 @@ github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDq
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU=
+github.com/tidwall/gjson v1.19.0/go.mod h1:V37/opeE/JbLUOfH0QTXiNez2l0RUjYUhpT4szFQAfc=
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=
@@ -73,37 +67,35 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
github.com/vektah/gqlparser/v2 v2.5.27 h1:RHPD3JOplpk5mP5JGX8RKZkt2/Vwj/PZv0HxTdwFp0s=
github.com/vektah/gqlparser/v2 v2.5.27/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
-github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE=
-github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
-go.mau.fi/libsignal v0.2.1 h1:vRZG4EzTn70XY6Oh/pVKrQGuMHBkAWlGRC22/85m9L0=
-go.mau.fi/libsignal v0.2.1/go.mod h1:iVvjrHyfQqWajOUaMEsIfo3IqgVMrhWcPiiEzk7NgoU=
-go.mau.fi/util v0.9.7 h1:AWGNbJfz1zRcQOKeOEYhKUG2fT+/26Gy6kyqcH8tnBg=
-go.mau.fi/util v0.9.7/go.mod h1:5T2f3ZWZFAGgmFwg3dGw7YK6kIsb9lryDzvynoR98pE=
-go.mau.fi/webp v0.2.0 h1:QVMenHw7JDb4vall5sV75JNBQj9Hw4u8AKbi1QetHvg=
-go.mau.fi/webp v0.2.0/go.mod h1:VSg9MyODn12Mb5pyG0NIyNFhujrmoFSsZBs8syOZD1Q=
-go.mau.fi/whatsmeow v0.0.0-20260305215846-fc65416c22c4 h1:FGA3NtCVNeCJ+C+KBg1pODsrfxC/trM3RHFWIeY7y4c=
-go.mau.fi/whatsmeow v0.0.0-20260305215846-fc65416c22c4/go.mod h1:mXCRFyPEPn4jqWz6Afirn8vY7DpHCPnlKq6I2cWwFHM=
+github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
+github.com/yuin/goldmark v1.8.2/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.9.10 h1:wzvz5iDHyqDXB8vgisD4d3SzucLXNM3iNY+1O1RoHtg=
+go.mau.fi/util v0.9.10/go.mod h1:YQOxySn+ZE3qSYqNxvyX7Yi3suA8YK17PS6QqBREW7A=
+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-20260630180629-b572e5bcb92b h1:ZUk1ErarDNpnbosXR/MeOz2gkqA4S1bh8zjaSRj7N+Y=
+go.mau.fi/whatsmeow v0.0.0-20260630180629-b572e5bcb92b/go.mod h1:9dmNTYZ/1pHjPw/bz+azBsGjAkcrZbqzMrKcvG5bJ8U=
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.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
-golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
-golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 h1:jiDhWWeC7jfWqR9c/uplMOqJ0sbNlNWv0UkzE0vX1MA=
-golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90/go.mod h1:xE1HEv6b+1SCZ5/uscMRjUBKtIxworgEcEi+/n9NQDQ=
-golang.org/x/image v0.37.0 h1:ZiRjArKI8GwxZOoEtUfhrBtaCN+4b/7709dlT6SSnQA=
-golang.org/x/image v0.37.0/go.mod h1:/3f6vaXC+6CEanU4KJxbcUZyEePbyKbaLoDOe4ehFYY=
-golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
-golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
-golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
-golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
-golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
-golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
+golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
+golang.org/x/exp v0.0.0-20260611194520-c48552f49976 h1:X8Hz2ImujgbmetVuW+w2YkyZChE3cBpZi2P158rTG9M=
+golang.org/x/exp v0.0.0-20260611194520-c48552f49976/go.mod h1:vnf4pv9iKZXY58sQE1L86zmNWJ4159e1RkcWiLCkeEY=
+golang.org/x/image v0.42.0 h1:1gSs6ehNWXLbkHBIPcWztk3D/6aIA/8hauiAYtlodVY=
+golang.org/x/image v0.42.0/go.mod h1:rrpelvGFt+kLPAjPM4HeWPgrl0FtafueU//e5N0qk/Q=
+golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ=
+golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0=
+golang.org/x/net v0.56.0 h1:Rw8j/hFzGvJUZwNBXnAtf5sVDVt+65SK2C7IxCxZt5o=
+golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec=
+golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM=
+golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
-golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
+golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
+golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
+golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
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=
@@ -115,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.26.5-0.20260322102453-0c955c396df7 h1:KUhlBHWGgknqYC2V8di4DFNh73atDtgPlqqO5FoLmPc=
-maunium.net/go/mautrix v0.26.5-0.20260322102453-0c955c396df7/go.mod h1:YWw8NWTszsbyFAznboicBObwHPgTSLcuTbVX2kY7U2M=
+maunium.net/go/mautrix v0.28.2-0.20260702123919-bf2dbb2aa895 h1:oe87/mP1vo4LnA6CJDEfyg5ZiAOar2quJNypfO8eS4Y=
+maunium.net/go/mautrix v0.28.2-0.20260702123919-bf2dbb2aa895/go.mod h1:mWXQNmOlrq4VTDU9f1HO03BSIswdUIyyY4wUKHqwzzY=
diff --git a/pkg/connector/backfill.go b/pkg/connector/backfill.go
index 21d0c4d..ee92ac2 100644
--- a/pkg/connector/backfill.go
+++ b/pkg/connector/backfill.go
@@ -115,14 +115,30 @@ func (wa *WhatsAppClient) downloadAndSaveWAHistorySyncData(ctx context.Context,
Uint32("chunk_order", evt.GetChunkOrder()).
Uint32("progress", evt.GetProgress()).
Logger()
- log.Debug().Msg("Downloading history sync")
+ log.Debug().
+ Int64("oldest_msg_in_chunk_ts", evt.GetOldestMsgInChunkTimestampSec()).
+ Any("full_request_meta", evt.GetFullHistorySyncOnDemandRequestMetadata()).
+ Any("access_status", evt.GetMessageAccessStatus()).
+ Str("peer_data_request_session_id", evt.GetPeerDataRequestSessionID()).
+ Msg("Downloading history sync")
blob, err := wa.Client.DownloadHistorySync(log.WithContext(ctx), evt, true)
if err != nil {
log.Err(err).Msg("Failed to download history sync")
return
}
+ if blob.GetSyncType() == waHistorySync.HistorySync_ON_DEMAND {
+ 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")
+ } else if err = wa.Client.DeleteMedia(ctx, whatsmeow.MediaHistory, evt.GetDirectPath(), evt.GetFileEncSHA256(), evt.GetEncHandle()); err != nil {
+ log.Err(err).Msg("Failed to delete history sync blob from server")
+ } else {
+ log.Debug().Msg("Finished handling on-demand history sync and deleted history sync blob from server")
+ }
+ return
+ }
err = wa.Main.DB.DoTxn(ctx, nil, func(ctx context.Context) (innerErr error) {
- resetTimer, innerErr = wa.handleWAHistorySync(ctx, evt, blob, true)
+ innerErr = wa.handleWAHistorySync(ctx, evt, blob, true)
if innerErr != nil {
return
}
@@ -134,6 +150,16 @@ func (wa *WhatsAppClient) downloadAndSaveWAHistorySyncData(ctx context.Context,
})
if err != nil {
log.Err(err).Msg("Failed to store history sync notification data")
+ } else {
+ resetTimer = blob.GetSyncType() == waHistorySync.HistorySync_INITIAL_BOOTSTRAP ||
+ blob.GetSyncType() == waHistorySync.HistorySync_RECENT ||
+ blob.GetSyncType() == waHistorySync.HistorySync_FULL
+ err = wa.Client.DeleteMedia(ctx, whatsmeow.MediaHistory, evt.GetDirectPath(), evt.GetFileEncSHA256(), evt.GetEncHandle())
+ if err != nil {
+ log.Err(err).Msg("Failed to delete history sync blob from server")
+ } else {
+ log.Debug().Msg("Deleted history sync blob from server")
+ }
}
return
}
@@ -143,9 +169,9 @@ func (wa *WhatsAppClient) handleWAHistorySync(
notif *waE2E.HistorySyncNotification,
evt *waHistorySync.HistorySync,
stopOnError bool,
-) (bool, error) {
+) error {
if evt == nil || evt.SyncType == nil {
- return false, nil
+ return nil
}
log := wa.UserLogin.Log.With().
Str("action", "store history sync").
@@ -170,7 +196,7 @@ func (wa *WhatsAppClient) handleWAHistorySync(
Int("recent_sticker_count", len(evt.GetRecentStickers())).
Int("past_participant_count", len(evt.GetPastParticipants())).
Msg("Ignoring history sync")
- return false, nil
+ return nil
}
log.Info().
Int("conversation_count", len(evt.GetConversations())).
@@ -178,7 +204,8 @@ func (wa *WhatsAppClient) handleWAHistorySync(
Dict("notification_metadata", zerolog.Dict().
Int64("oldest_msg_in_chunk_ts", notif.GetOldestMsgInChunkTimestampSec()).
Any("full_request_meta", notif.GetFullHistorySyncOnDemandRequestMetadata()).
- Any("access_status", notif.GetMessageAccessStatus())).
+ Any("access_status", notif.GetMessageAccessStatus()).
+ Str("peer_data_request_session_id", notif.GetPeerDataRequestSessionID())).
Msg("Storing history sync")
start := time.Now()
successfullySavedTotal := 0
@@ -219,7 +246,7 @@ func (wa *WhatsAppClient) handleWAHistorySync(
return c.Stringer("chat_jid", jid)
})
- var minTime, maxTime time.Time
+ var minTime, maxTime, firstItemTime, lastItemTime time.Time
var minTimeIndex, maxTimeIndex int
ignoredTypes := 0
@@ -233,8 +260,15 @@ func (wa *WhatsAppClient) handleWAHistorySync(
Str("msg_id", rawMsg.GetMessage().GetKey().GetID()).
Uint64("msg_time_seconds", rawMsg.GetMessage().GetMessageTimestamp()).
Msg("Dropping historical message due to parse error")
+ log.Trace().
+ Any("web_message_info", rawMsg.GetMessage()).
+ Msg("Content of event that failed to parse")
continue
}
+ if firstItemTime.IsZero() {
+ firstItemTime = msgEvt.Info.Timestamp
+ }
+ lastItemTime = msgEvt.Info.Timestamp
if minTime.IsZero() || msgEvt.Info.Timestamp.Before(minTime) {
minTime = msgEvt.Info.Timestamp
minTimeIndex = i
@@ -267,6 +301,9 @@ func (wa *WhatsAppClient) handleWAHistorySync(
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()).
@@ -275,7 +312,9 @@ func (wa *WhatsAppClient) handleWAHistorySync(
Bool("archived", conv.GetArchived()).
Uint32("pinned", conv.GetPinned()).
Uint64("mute_end", conv.GetMuteEndTime()).
- Uint32("unread_count", conv.GetUnreadCount()),
+ Uint32("unread_count", conv.GetUnreadCount()).
+ Bool("end_of_history", conv.GetEndOfHistoryTransfer()).
+ Stringer("end_of_history_type", conv.GetEndOfHistoryTransferType()),
).
Msg("Collected messages to save from history sync conversation")
@@ -283,7 +322,7 @@ func (wa *WhatsAppClient) handleWAHistorySync(
err = wa.Main.DB.Conversation.Put(ctx, wadb.NewConversation(wa.UserLogin.ID, jid, conv, maxTime))
if err != nil {
if stopOnError {
- return false, fmt.Errorf("failed to save conversation metadata for %s: %w", jid, err)
+ return fmt.Errorf("failed to save conversation metadata for %s: %w", jid, err)
}
log.Err(err).Msg("Failed to save conversation metadata")
continue
@@ -291,7 +330,7 @@ func (wa *WhatsAppClient) handleWAHistorySync(
err = wa.Main.DB.Message.Put(ctx, wa.UserLogin.ID, jid, messages)
if err != nil {
if stopOnError {
- return false, fmt.Errorf("failed to save messages in %s: %w", jid, err)
+ return fmt.Errorf("failed to save messages in %s: %w", jid, err)
}
log.Err(err).Msg("Failed to save messages")
failedToSaveTotal += len(messages)
@@ -301,7 +340,7 @@ func (wa *WhatsAppClient) handleWAHistorySync(
err = wa.Main.Bridge.DB.BackfillTask.MarkNotDone(ctx, wa.makeWAPortalKey(jid), wa.UserLogin.ID)
if err != nil {
if stopOnError {
- return false, fmt.Errorf("failed to mark backfill task as not done for %s: %w", jid, err)
+ return fmt.Errorf("failed to mark backfill task as not done for %s: %w", jid, err)
}
log.Err(err).Msg("Failed to mark backfill task as not done")
}
@@ -313,9 +352,7 @@ func (wa *WhatsAppClient) handleWAHistorySync(
Int("total_message_count", totalMessageCount).
Dur("duration", time.Since(start)).
Msg("Finished storing history sync")
- resetTimer := evt.GetSyncType() == waHistorySync.HistorySync_RECENT ||
- evt.GetSyncType() == waHistorySync.HistorySync_FULL
- return resetTimer, nil
+ return nil
}
func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) {
@@ -363,8 +400,8 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) {
return
}
wrappedInfo, err := wa.getChatInfo(ctx, conv.ChatJID, conv, true)
- if errors.Is(err, whatsmeow.ErrNotInGroup) {
- log.Debug().Stringer("chat_jid", conv.ChatJID).
+ 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)
//if err != nil {
@@ -439,24 +476,34 @@ func (wa *WhatsAppClient) FetchMessages(ctx context.Context, params bridgev2.Fet
}
var markRead bool
var startTime, endTime *time.Time
+ var conv *wadb.Conversation
+ if params.Forward || wa.Main.Config.HistorySync.BackwardsOnDemand {
+ conv, err = wa.Main.DB.Conversation.Get(ctx, wa.UserLogin.ID, portalJID)
+ if err != nil {
+ return nil, fmt.Errorf("failed to get conversation from database: %w", err)
+ }
+ }
if params.Forward {
if params.AnchorMessage != nil {
startTime = ptr.Ptr(params.AnchorMessage.Timestamp)
}
- conv, err := wa.Main.DB.Conversation.Get(ctx, wa.UserLogin.ID, portalJID)
- if err != nil {
- return nil, fmt.Errorf("failed to get conversation from database: %w", err)
- } else if conv != nil {
+ if conv != nil {
markRead = !ptr.Val(conv.MarkedAsUnread) && ptr.Val(conv.UnreadCount) == 0
}
- } else if params.Cursor != "" {
- endTimeUnix, err := strconv.ParseInt(string(params.Cursor), 10, 64)
- if err != nil {
- return nil, fmt.Errorf("failed to parse cursor: %w", err)
+ } else {
+ if params.AnchorMessage != nil {
+ endTime = ptr.Ptr(params.AnchorMessage.Timestamp)
+ }
+ if params.Cursor != "" {
+ endTimeUnix, err := strconv.ParseInt(string(params.Cursor), 10, 64)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse cursor: %w", err)
+ }
+ cursorTime := time.Unix(endTimeUnix, 0)
+ if endTime == nil || cursorTime.Before(*endTime) {
+ endTime = &cursorTime
+ }
}
- endTime = ptr.Ptr(time.Unix(endTimeUnix, 0))
- } else if params.AnchorMessage != nil {
- endTime = ptr.Ptr(params.AnchorMessage.Timestamp)
}
var anchorID types.MessageID
if params.AnchorMessage != nil {
@@ -465,19 +512,31 @@ func (wa *WhatsAppClient) FetchMessages(ctx context.Context, params bridgev2.Fet
anchorID = parsedID.ID
}
}
+ var hasMore bool
+ if !params.Forward && wa.Main.Config.HistorySync.BackwardsOnDemand {
+ hasMore = conv != nil && ptr.Val(conv.EndOfHistoryTransferType) == waHistorySync.Conversation_COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY
+ }
messages, err := wa.Main.DB.Message.GetBetween(ctx, wa.UserLogin.ID, portalJID, startTime, endTime, params.Count+1)
if err != nil {
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)
+ if hasMore && !params.AllowSlowFetch {
+ return &bridgev2.FetchMessagesResponse{
+ MoreRequiresSlowFetch: true,
+ HasMore: true,
+ Forward: params.Forward,
+ }, nil
+ } else if hasMore {
+ return wa.fetchMessagesFromPhone(ctx, params)
+ }
return &bridgev2.FetchMessagesResponse{
HasMore: false,
Forward: params.Forward,
}, nil
}
- hasMore := false
- oldestTS := messages[len(messages)-1].GetMessageTimestamp()
- newestTS := messages[0].GetMessageTimestamp()
if len(messages) > params.Count {
+ oldestTS := messages[len(messages)-1].GetMessageTimestamp()
hasMore = true
// For safety, cut off messages with the oldest timestamp in the response.
// Otherwise, if there are multiple messages with the same timestamp, the next fetch may miss some.
@@ -488,19 +547,81 @@ func (wa *WhatsAppClient) FetchMessages(ctx context.Context, params bridgev2.Fet
}
}
}
- convertedMessages := make([]*bridgev2.BackfillMessage, len(messages))
+ resp, err := wa.convertHistorySyncMessages(ctx, params.Portal, portalJID, messages, true)
+ if err != nil {
+ return nil, fmt.Errorf("failed to convert messages: %w", err)
+ }
+ resp.HasMore = hasMore
+ resp.Forward = params.Forward
+ resp.MarkRead = markRead
+ return resp, nil
+}
+
+func (wa *WhatsAppClient) deleteHistorySyncMessages(ctx context.Context, portalJID types.JID, newestTS, oldestTS uint64) {
+ var err error
+ var rows int64
+ if (newestTS == 0 && oldestTS == 0) || !wa.Main.Bridge.Config.Backfill.Queue.AnyEnabled() {
+ // If the backfill queue isn't enabled, delete all messages after backfilling a batch.
+ rows, err = wa.Main.DB.Message.DeleteAllInChat(ctx, wa.UserLogin.ID, portalJID)
+ } else {
+ // Otherwise just delete the messages that got backfilled
+ rows, err = wa.Main.DB.Message.DeleteBetween(ctx, wa.UserLogin.ID, portalJID, newestTS, oldestTS)
+ }
+ if err != nil {
+ zerolog.Ctx(ctx).Warn().Err(err).
+ Stringer("portal_jid", portalJID).
+ Uint64("newest_ts", newestTS).
+ Uint64("oldest_ts", oldestTS).
+ Msg("Failed to delete messages from database after backfill")
+ } else {
+ zerolog.Ctx(ctx).Debug().
+ Stringer("portal_jid", portalJID).
+ Uint64("newest_ts", newestTS).
+ Uint64("oldest_ts", oldestTS).
+ Int64("rows_affected", rows).
+ Msg("Deleted history sync messages from database")
+ }
+}
+
+func (wa *WhatsAppClient) convertHistorySyncMessages(
+ ctx context.Context,
+ portal *bridgev2.Portal,
+ portalJID types.JID,
+ messages []*waWeb.WebMessageInfo,
+ explodeOnError bool,
+) (*bridgev2.FetchMessagesResponse, error) {
+ oldestTS := messages[len(messages)-1].GetMessageTimestamp()
+ newestTS := messages[0].GetMessageTimestamp()
+ convertedMessages := make([]*bridgev2.BackfillMessage, 0, len(messages))
var mediaRequests []*wadb.MediaRequest
for i, msg := range messages {
evt, err := wa.Client.ParseWebMessage(portalJID, msg)
if err != nil {
- // This should never happen because the info is already parsed once before being stored in the database
- return nil, fmt.Errorf("failed to parse info of message %s: %w", msg.GetKey().GetID(), err)
+ if explodeOnError {
+ // This should never happen because the info is already parsed once before being stored in the database
+ return nil, fmt.Errorf("failed to parse info of message %s: %w", msg.GetKey().GetID(), err)
+ }
+ zerolog.Ctx(ctx).Warn().Err(err).
+ Int("msg_index", i).
+ Str("msg_id", msg.GetKey().GetID()).
+ Uint64("msg_time_seconds", msg.GetMessageTimestamp()).
+ Msg("Dropping historical message due to parse error")
+ zerolog.Ctx(ctx).Trace().
+ Any("web_message_info", msg.GetMessage()).
+ Msg("Content of event that failed to parse")
+ continue
+ }
+ if !explodeOnError {
+ msgType := getMessageType(evt.Message)
+ if msgType == "ignore" || strings.HasPrefix(msgType, "unknown_protocol_") {
+ continue
+ }
}
- var mediaReq *wadb.MediaRequest
isViewOnce := evt.IsViewOnce || evt.IsViewOnceV2 || evt.IsViewOnceV2Extension
- convertedMessages[i], mediaReq = wa.convertHistorySyncMessage(
- ctx, params.Portal, &evt.Info, evt.Message, evt.RawMessage, isViewOnce, msg.Reactions,
+ converted, mediaReq := wa.convertHistorySyncMessage(
+ ctx, portal, &evt.Info, evt.Message, evt.RawMessage, isViewOnce, msg.Reactions,
)
+ convertedMessages = append(convertedMessages, converted)
if mediaReq != nil {
mediaRequests = append(mediaRequests, mediaReq)
}
@@ -509,24 +630,10 @@ func (wa *WhatsAppClient) FetchMessages(ctx context.Context, params bridgev2.Fet
return &bridgev2.FetchMessagesResponse{
Messages: convertedMessages,
Cursor: networkid.PaginationCursor(strconv.FormatUint(oldestTS, 10)),
- HasMore: hasMore,
- Forward: endTime == nil,
- MarkRead: markRead,
- // TODO set remaining or total count
CompleteCallback: func() {
// TODO this only deletes after backfilling. If there's no need for backfill after a relogin,
// the messages will be stuck in the database
- var err error
- if !wa.Main.Bridge.Config.Backfill.Queue.Enabled && !wa.Main.Bridge.Config.Backfill.WillPaginateManually {
- // If the backfill queue isn't enabled, delete all messages after backfilling a batch.
- err = wa.Main.DB.Message.DeleteAllInChat(ctx, wa.UserLogin.ID, portalJID)
- } else {
- // Otherwise just delete the messages that got backfilled
- err = wa.Main.DB.Message.DeleteBetween(ctx, wa.UserLogin.ID, portalJID, newestTS, oldestTS)
- }
- if err != nil {
- zerolog.Ctx(ctx).Warn().Err(err).Msg("Failed to delete messages from database after backfill")
- }
+ wa.deleteHistorySyncMessages(ctx, portalJID, newestTS, oldestTS)
if len(mediaRequests) > 0 {
go func(ctx context.Context) {
for _, req := range mediaRequests {
@@ -544,6 +651,94 @@ func (wa *WhatsAppClient) FetchMessages(ctx context.Context, params bridgev2.Fet
}, nil
}
+func (wa *WhatsAppClient) fetchMessagesFromPhone(ctx context.Context, params bridgev2.FetchMessagesParams) (*bridgev2.FetchMessagesResponse, error) {
+ if params.AnchorMessage == nil {
+ return nil, fmt.Errorf("anchor message is required to fetch messages from phone")
+ }
+ parsed, err := waid.ParseMessageID(params.AnchorMessage.ID)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse anchor message ID: %w", err)
+ }
+
+ msgID := wa.Client.GenerateMessageID()
+ reqData := wa.Client.BuildHistorySyncRequest(&types.MessageInfo{
+ MessageSource: types.MessageSource{
+ Chat: parsed.Chat,
+ Sender: parsed.Sender,
+ IsFromMe: parsed.Sender.ToNonAD() == wa.JID.ToNonAD() || parsed.Sender.ToNonAD() == wa.Device.GetLID().ToNonAD(),
+ IsGroup: parsed.Chat.Server == types.GroupServer,
+ },
+ ID: parsed.ID,
+ Timestamp: params.AnchorMessage.Timestamp,
+ }, 50)
+ zerolog.Ctx(ctx).Debug().
+ Str("request_msg_id", msgID).
+ Any("anchor_msg_parsed", parsed).
+ Any("request_data", reqData).
+ Msg("Sending history sync request")
+ _, err = wa.Client.SendMessage(ctx, wa.JID.ToNonAD(), reqData, whatsmeow.SendRequestExtra{
+ ID: msgID,
+ Peer: true,
+ })
+ if err != nil {
+ return nil, fmt.Errorf("failed to send history sync request: %w", err)
+ }
+ return &bridgev2.FetchMessagesResponse{
+ HasMore: true,
+ Pending: true,
+ }, nil
+}
+
+func (wa *WhatsAppClient) handleOnDemandHistorySync(ctx context.Context, blob *waHistorySync.HistorySync) {
+ if len(blob.GetConversations()) > 1 {
+ zerolog.Ctx(ctx).Warn().
+ Int("conversation_count", len(blob.GetConversations())).
+ Msg("Received on-demand history sync with multiple conversations")
+ }
+ for _, conv := range blob.GetConversations() {
+ portalJID, err := types.ParseJID(conv.GetID())
+ if err != nil {
+ zerolog.Ctx(ctx).Err(err).Str("jid", conv.GetID()).Msg("Failed to parse portal JID")
+ continue
+ }
+ portal, err := wa.Main.Bridge.GetPortalByKey(ctx, wa.makeWAPortalKey(portalJID))
+ if err != nil {
+ zerolog.Ctx(ctx).Err(err).Stringer("portal_jid", portalJID).Msg("Failed to get portal for on-demand history sync")
+ continue
+ }
+ ctx := zerolog.Ctx(ctx).With().
+ Str("portal_id", string(portal.ID)).
+ Str("portal_receiver", string(portal.Receiver)).
+ Stringer("portal_mxid", portal.MXID).
+ Logger().WithContext(ctx)
+ portal.HandleRemoteBackfill(ctx, wa.UserLogin, &simplevent.Backfill{
+ EventMeta: simplevent.EventMeta{
+ Type: bridgev2.RemoteEventBackfill,
+ PortalKey: portal.PortalKey,
+ },
+ GetDataFunc: func(ctx context.Context, portal *bridgev2.Portal) (*bridgev2.FetchMessagesResponse, error) {
+ if len(conv.GetMessages()) == 0 {
+ return &bridgev2.FetchMessagesResponse{}, nil
+ }
+ messages := make([]*waWeb.WebMessageInfo, len(conv.GetMessages()))
+ for i, rawMsg := range conv.GetMessages() {
+ messages[i] = rawMsg.Message
+ }
+ zerolog.Ctx(ctx).Debug().
+ 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)
+ if err != nil {
+ return nil, err
+ }
+ resp.HasMore = conv.GetEndOfHistoryTransferType() == waHistorySync.Conversation_COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY
+ return resp, nil
+ },
+ })
+ }
+}
+
func (wa *WhatsAppClient) convertHistorySyncMessage(
ctx context.Context, portal *bridgev2.Portal, info *types.MessageInfo, msg, rawMsg *waE2E.Message, isViewOnce bool, reactions []*waWeb.Reaction,
) (*bridgev2.BackfillMessage, *wadb.MediaRequest) {
diff --git a/pkg/connector/capabilities.go b/pkg/connector/capabilities.go
index 202569b..3e6f658 100644
--- a/pkg/connector/capabilities.go
+++ b/pkg/connector/capabilities.go
@@ -19,6 +19,7 @@ var WhatsAppGeneralCaps = &bridgev2.NetworkGeneralCapabilities{
AggressiveUpdateInfo: true,
ImplicitReadReceipts: true,
Provisioning: bridgev2.ProvisioningCapabilities{
+ ImagePackImport: true,
ResolveIdentifier: bridgev2.ResolveIdentifierCapabilities{
CreateDM: true,
LookupPhone: true,
@@ -51,7 +52,7 @@ func (wa *WhatsAppConnector) GetCapabilities() *bridgev2.NetworkGeneralCapabilit
}
func (wa *WhatsAppConnector) GetBridgeInfoVersion() (info, caps int) {
- return 1, 7
+ return 1, 8
}
const WAMaxFileSize = 2000 * 1024 * 1024
@@ -66,7 +67,7 @@ func supportedIfFFmpeg() event.CapabilitySupportLevel {
}
func capID() string {
- base := "fi.mau.whatsapp.capabilities.2025_12_15"
+ base := "fi.mau.whatsapp.capabilities.2026_05_12"
if ffmpeg.Supported() {
return base + "+ffmpeg"
}
@@ -125,10 +126,10 @@ var whatsappCaps = &event.RoomFeatures{
event.CapMsgSticker: {
MimeTypes: map[string]event.CapabilitySupportLevel{
"image/webp": event.CapLevelFullySupported,
- // TODO see if sending lottie is possible
- //"video/lottie+json": event.CapLevelFullySupported,
"image/png": event.CapLevelPartialSupport,
"image/jpeg": event.CapLevelPartialSupport,
+ // This will only be accepted if it was imported from WhatsApp
+ "video/lottie+json": event.CapLevelPartialSupport,
},
Caption: event.CapLevelDropped,
MaxSize: WAMaxFileSize,
diff --git a/pkg/connector/chatinfo.go b/pkg/connector/chatinfo.go
index 5555566..7ffbb14 100644
--- a/pkg/connector/chatinfo.go
+++ b/pkg/connector/chatinfo.go
@@ -257,7 +257,7 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn
Name: ptr.Ptr(info.Name),
Topic: ptr.Ptr(info.Topic),
Members: &bridgev2.ChatMemberList{
- IsFull: !info.IsIncognito,
+ IsFull: !info.IsIncognito && !info.IsParent,
TotalMemberCount: len(info.Participants),
MemberMap: make(map[networkid.UserID]bridgev2.ChatMember, len(info.Participants)),
PowerLevels: &bridgev2.PowerLevelOverrides{
@@ -284,11 +284,15 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn
},
ExtraUpdates: extraUpdater,
}
+ var hasSelf bool
for _, pcp := range info.Participants {
member := bridgev2.ChatMember{
EventSender: wa.makeEventSender(ctx, pcp.JID),
Membership: event.MembershipJoin,
}
+ if member.EventSender.IsFromMe {
+ hasSelf = true
+ }
if pcp.IsSuperAdmin {
member.PowerLevel = ptr.Ptr(superAdminPL)
} else if pcp.IsAdmin {
@@ -299,18 +303,21 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn
member.MemberEventExtra = map[string]any{
"com.beeper.exclude_from_timeline": true,
}
- wrapped.Members.MemberMap[waid.MakeUserID(pcp.JID)] = member
+ wrapped.Members.MemberMap.Set(member)
if pcp.JID.Server == types.HiddenUserServer && !pcp.PhoneNumber.IsEmpty() {
- wrapped.Members.MemberMap[waid.MakeUserID(pcp.PhoneNumber)] = bridgev2.ChatMember{
+ wrapped.Members.MemberMap.Add(bridgev2.ChatMember{
EventSender: bridgev2.EventSender{Sender: waid.MakeUserID(pcp.PhoneNumber)},
Membership: event.MembershipLeave,
PrevMembership: event.MembershipJoin,
MemberEventExtra: map[string]any{
"com.beeper.exclude_from_timeline": true,
},
- }
+ })
}
}
+ if info.IsParent && !hasSelf && info.AddressingMode == types.AddressingModeLID {
+ wrapped.Members.MemberMap.Add(bridgev2.ChatMember{EventSender: wa.makeEventSender(ctx, wa.Device.LID)})
+ }
if !info.LinkedParentJID.IsEmpty() {
wrapped.ParentID = ptr.Ptr(waid.MakePortalID(info.LinkedParentJID))
@@ -450,7 +457,7 @@ func (wa *WhatsAppClient) makePortalAvatarFetcher(avatarID string, sender types.
wrappedAvatar = &bridgev2.Avatar{
ID: networkid.AvatarID(avatar.ID),
Get: func(ctx context.Context) ([]byte, error) {
- return wa.Client.DownloadMediaWithPath(ctx, avatar.DirectPath, nil, nil, nil, 0, "", "")
+ return wa.Client.DownloadMediaWithOnlyPath(ctx, avatar.DirectPath)
},
}
}
@@ -489,7 +496,7 @@ func (wa *WhatsAppClient) wrapNewsletterInfo(ctx context.Context, info *types.Ne
if info.ThreadMeta.Picture != nil {
avatar.ID = networkid.AvatarID(info.ThreadMeta.Picture.ID)
avatar.Get = func(ctx context.Context) ([]byte, error) {
- return wa.Client.DownloadMediaWithPath(ctx, info.ThreadMeta.Picture.DirectPath, nil, nil, nil, 0, "", "")
+ return wa.Client.DownloadMediaWithOnlyPath(ctx, info.ThreadMeta.Picture.DirectPath)
}
} else if info.ThreadMeta.Preview.ID != "" {
avatar.ID = networkid.AvatarID(info.ThreadMeta.Preview.ID)
@@ -500,7 +507,7 @@ func (wa *WhatsAppClient) wrapNewsletterInfo(ctx context.Context, info *types.Ne
} else if meta.ThreadMeta.Picture == nil {
return nil, fmt.Errorf("full res avatar info is missing")
}
- return wa.Client.DownloadMediaWithPath(ctx, meta.ThreadMeta.Picture.DirectPath, nil, nil, nil, 0, "", "")
+ return wa.Client.DownloadMediaWithOnlyPath(ctx, meta.ThreadMeta.Picture.DirectPath)
}
} else {
avatar.ID = "remove"
diff --git a/pkg/connector/client.go b/pkg/connector/client.go
index 367ad14..3f19bf7 100644
--- a/pkg/connector/client.go
+++ b/pkg/connector/client.go
@@ -38,6 +38,7 @@ import (
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid"
"maunium.net/go/mautrix/bridgev2/status"
+ "maunium.net/go/mautrix/event"
"go.mau.fi/mautrix-whatsapp/pkg/waid"
)
@@ -128,6 +129,7 @@ var (
_ bridgev2.PushableNetworkAPI = (*WhatsAppClient)(nil)
_ bridgev2.BackgroundSyncingNetworkAPI = (*WhatsAppClient)(nil)
_ bridgev2.ChatViewingNetworkAPI = (*WhatsAppClient)(nil)
+ _ bridgev2.StickerImportingNetworkAPI = (*WhatsAppClient)(nil)
)
var pushCfg = &bridgev2.PushConfig{
@@ -467,3 +469,12 @@ func (wa *WhatsAppClient) updatePresence(ctx context.Context, presence types.Pre
}
return err
}
+
+func (wa *WhatsAppClient) DownloadImagePack(ctx context.Context, url string) (*bridgev2.ImportedImagePack, error) {
+ return wa.Main.MsgConv.DownloadImagePack(ctx, wa.UserLogin.ID, wa.Client, url)
+}
+
+func (wa *WhatsAppClient) ListImagePacks(ctx context.Context) ([]*event.ImagePackMetadata, error) {
+ // TODO
+ return nil, nil
+}
diff --git a/pkg/connector/config.go b/pkg/connector/config.go
index 6a097c2..e51c80a 100644
--- a/pkg/connector/config.go
+++ b/pkg/connector/config.go
@@ -2,6 +2,7 @@ package connector
import (
_ "embed"
+ "fmt"
"strings"
"text/template"
"time"
@@ -70,6 +71,8 @@ type Config struct {
RequestLocalTime int `yaml:"request_local_time"`
MaxAsyncHandle int64 `yaml:"max_async_handle"`
} `yaml:"media_requests"`
+
+ BackwardsOnDemand bool `yaml:"backwards_on_demand"`
} `yaml:"history_sync"`
displaynameTemplate *template.Template `yaml:"-"`
@@ -88,7 +91,15 @@ func (c *Config) UnmarshalYAML(node *yaml.Node) error {
func (c *Config) PostProcess() error {
var err error
c.displaynameTemplate, err = template.New("displayname").Parse(c.DisplaynameTemplate)
- return err
+ if err != nil {
+ return err
+ }
+ // Try to execute template to make sure it's valid
+ _, err = c.formatDisplayname(types.PSAJID, "", types.ContactInfo{})
+ if err != nil {
+ return fmt.Errorf("failed to execute displayname template: %w", err)
+ }
+ return nil
}
func upgradeConfig(helper up.Helper) {
@@ -134,6 +145,7 @@ func upgradeConfig(helper up.Helper) {
helper.Copy(up.Str, "history_sync", "media_requests", "request_method")
helper.Copy(up.Int, "history_sync", "media_requests", "request_local_time")
helper.Copy(up.Int, "history_sync", "media_requests", "max_async_handle")
+ helper.Copy(up.Bool, "history_sync", "backwards_on_demand")
}
type DisplaynameParams struct {
@@ -148,7 +160,7 @@ type DisplaynameParams struct {
Short string
}
-func (c *Config) FormatDisplayname(jid types.JID, phone string, contact types.ContactInfo) string {
+func (c *Config) formatDisplayname(jid types.JID, phone string, contact types.ContactInfo) (string, error) {
var nameBuf strings.Builder
if phone == "" && jid.Server == types.DefaultUserServer {
phone = "+" + jid.User
@@ -167,13 +179,21 @@ func (c *Config) FormatDisplayname(jid types.JID, phone string, contact types.Co
Name: contact.FullName,
Short: contact.FirstName,
})
+ return nameBuf.String(), err
+}
+
+func (c *Config) FormatDisplayname(jid types.JID, phone string, contact types.ContactInfo) string {
+ name, err := c.formatDisplayname(jid, phone, contact)
if err != nil {
panic(err)
}
- return nameBuf.String()
+ return name
}
func redactPhone(phone string) string {
+ if len(phone) <= 4 {
+ return phone
+ }
// This doesn't keep 2+ digit country codes properly, but whatever
return phone[:2] + strings.Repeat("∙", len(phone)-4) + phone[len(phone)-2:]
}
diff --git a/pkg/connector/directmedia.go b/pkg/connector/directmedia.go
index a4a3d73..89a54fc 100644
--- a/pkg/connector/directmedia.go
+++ b/pkg/connector/directmedia.go
@@ -17,6 +17,7 @@
package connector
import (
+ "bytes"
"context"
"encoding/json"
"errors"
@@ -67,6 +68,8 @@ func (wa *WhatsAppConnector) Download(ctx context.Context, mediaID networkid.Med
return wa.downloadMessageDirectMedia(ctx, parsedID, params)
} else if parsedID.Avatar != nil {
return wa.downloadAvatarDirectMedia(ctx, parsedID, params)
+ } else if parsedID.Sticker != nil {
+ return wa.downloadStickerDirectMedia(ctx, parsedID, params)
} else {
return nil, fmt.Errorf("unexpected media ID parsing result")
}
@@ -128,15 +131,30 @@ func (wa *WhatsAppConnector) downloadAvatarDirectMedia(ctx context.Context, pars
}
return &mediaproxy.GetMediaResponseFile{
Callback: func(w *os.File) (*mediaproxy.FileMeta, error) {
- return &mediaproxy.FileMeta{}, waClient.Client.DownloadMediaWithPathToFile(
- ctx, cachedInfo.DirectPath, nil, nil, nil, 0, "", "", w,
- )
+ return &mediaproxy.FileMeta{}, waClient.Client.DownloadMediaWithOnlyPathToFile(ctx, cachedInfo.DirectPath, w)
},
}, nil
}
+func (wa *WhatsAppConnector) downloadStickerDirectMedia(ctx context.Context, parsedID *waid.ParsedMediaID, params map[string]string) (mediaproxy.GetMediaResponse, error) {
+ ul := wa.Bridge.GetCachedUserLoginByID(parsedID.UserLogin)
+ if ul == nil {
+ return nil, fmt.Errorf("%w: user login %s not found", bridgev2.ErrNotLoggedIn, parsedID.UserLogin)
+ }
+ waClient := ul.Client.(*WhatsAppClient)
+ if waClient.Client == nil {
+ 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)
+ if err != nil {
+ return nil, err
+ } else if sticker == nil {
+ return nil, mautrix.MNotFound.WithMessage("Sticker not found in pack")
+ }
+ return wa.makeDirectMediaResponse(ctx, waClient, sticker, sticker.MimeType, "", nil, params)
+}
+
func (wa *WhatsAppConnector) downloadMessageDirectMedia(ctx context.Context, parsedID *waid.ParsedMediaID, params map[string]string) (mediaproxy.GetMediaResponse, error) {
- log := zerolog.Ctx(ctx)
msg, err := wa.Bridge.DB.Message.GetFirstPartByID(ctx, parsedID.UserLogin, parsedID.Message.String())
if err != nil {
return nil, fmt.Errorf("failed to get message: %w", err)
@@ -152,6 +170,9 @@ func (wa *WhatsAppConnector) downloadMessageDirectMedia(ctx context.Context, par
if err != nil {
return nil, fmt.Errorf("failed to unmarshal media keys: %w", err)
}
+ if version := parsedID.Message.Version; len(version) > 0 && !bytes.Equal(version, keys.EncSHA256) && !bytes.Equal(version, keys.SHA256) {
+ return nil, mautrix.MNotFound.WithMessage("Version mismatch, media was likely replaced")
+ }
var ul *bridgev2.UserLogin
if parsedID.UserLogin != "" {
ul = wa.Bridge.GetCachedUserLoginByID(parsedID.UserLogin)
@@ -174,16 +195,29 @@ func (wa *WhatsAppConnector) downloadMessageDirectMedia(ctx context.Context, par
if waClient.Client == nil {
return nil, fmt.Errorf("no WhatsApp client found on login")
}
+ return wa.makeDirectMediaResponse(ctx, waClient, keys, keys.MimeType, msg.ID, keys, params)
+}
+
+func (wa *WhatsAppConnector) makeDirectMediaResponse(
+ ctx context.Context,
+ waClient *WhatsAppClient,
+ dm whatsmeow.DownloadableMessage,
+ mimeType string,
+ msgID networkid.MessageID,
+ keys *msgconv.FailedMediaKeys,
+ params map[string]string,
+) (mediaproxy.GetMediaResponse, error) {
return &mediaproxy.GetMediaResponseFile{
Callback: func(f *os.File) (*mediaproxy.FileMeta, error) {
- err := waClient.Client.DownloadToFile(ctx, keys, f)
- if errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith403) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith404) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith410) || errors.Is(err, whatsmeow.ErrNoURLPresent) {
+ log := zerolog.Ctx(ctx)
+ err := waClient.Client.DownloadToFile(ctx, dm, f)
+ if keys != nil && (errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith403) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith404) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith410) || errors.Is(err, whatsmeow.ErrNoURLPresent)) {
val := params["fi.mau.whatsapp.reload_media"]
if val == "false" || (!wa.Config.DirectMediaAutoRequest && val != "true") {
return nil, ErrReloadNeeded
}
log.Trace().Msg("Media not found for direct download, requesting and waiting")
- err = waClient.requestAndWaitDirectMedia(ctx, msg.ID, keys)
+ err = waClient.requestAndWaitDirectMedia(ctx, msgID, keys)
if err != nil {
log.Trace().Err(err).Msg("Failed to wait for media for direct download")
return nil, err
@@ -191,30 +225,29 @@ func (wa *WhatsAppConnector) downloadMessageDirectMedia(ctx context.Context, par
log.Trace().Msg("Retrying download after successful retry")
err = waClient.Client.DownloadToFile(ctx, keys, f)
}
- if errors.Is(err, whatsmeow.ErrFileLengthMismatch) || errors.Is(err, whatsmeow.ErrInvalidMediaSHA256) {
+ if errors.Is(err, whatsmeow.ErrInvalidMediaSHA256) {
zerolog.Ctx(ctx).Warn().Err(err).Msg("Mismatching media checksums in message. Ignoring because WhatsApp seems to ignore them too")
} else if err != nil {
return nil, err
}
- mime := keys.MimeType
- if mime == "application/was" {
+ if mimeType == "application/was" {
if _, err := f.Seek(0, io.SeekStart); err != nil {
return nil, fmt.Errorf("failed to seek to start of sticker zip: %w", err)
} else if zipData, err := io.ReadAll(f); err != nil {
return nil, fmt.Errorf("failed to read sticker zip: %w", err)
- } else if data, err := msgconv.ExtractAnimatedSticker(zipData); err != nil {
+ } else if data, _, err := msgconv.ExtractAnimatedSticker(zipData); err != nil {
return nil, fmt.Errorf("failed to extract animated sticker: %w %x", err, zipData)
} else if _, err := f.WriteAt(data, 0); err != nil {
return nil, fmt.Errorf("failed to write animated sticker to file: %w", err)
} else if err := f.Truncate(int64(len(data))); err != nil {
return nil, fmt.Errorf("failed to truncate animated sticker file: %w", err)
}
- mime = "video/lottie+json"
+ mimeType = "video/lottie+json"
}
return &mediaproxy.FileMeta{
- ContentType: mime,
+ ContentType: mimeType,
}, nil
},
}, nil
diff --git a/pkg/connector/events.go b/pkg/connector/events.go
index de5bdb8..411c39e 100644
--- a/pkg/connector/events.go
+++ b/pkg/connector/events.go
@@ -91,6 +91,7 @@ type WAMessageEvent struct {
parsedMessageType string
isUndecryptableUpsertSubEvent bool
+ dontRenderEdited bool
postHandle func()
}
@@ -181,12 +182,15 @@ func (evt *WAMessageEvent) ConvertEdit(ctx context.Context, portal *bridgev2.Por
}
var editedMsg *waE2E.Message
var previouslyConvertedPart *bridgev2.ConvertedMessagePart
+ targetMessage := evt.GetTargetMessage()
+ cacheMessage := targetMessage
if evt.isUndecryptableUpsertSubEvent {
// TODO db metadata needs to be updated in this case to remove the error
editedMsg = evt.Message
+ cacheMessage = evt.GetID()
} else {
editedMsg = evt.Message.GetProtocolMessage().GetEditedMessage()
- previouslyConvertedPart = evt.wa.Main.GetMediaEditCache(portal, evt.GetTargetMessage())
+ previouslyConvertedPart = evt.wa.Main.GetMediaEditCache(portal, targetMessage)
meta := existing[0].Metadata.(*waid.MessageMetadata)
if slices.Contains(meta.Edits, evt.Info.ID) {
return nil, fmt.Errorf("%w: edit already handled", bridgev2.ErrIgnoringRemoteEvent)
@@ -202,9 +206,11 @@ func (evt *WAMessageEvent) ConvertEdit(ctx context.Context, portal *bridgev2.Por
evt.postHandle = func() {
evt.wa.processFailedMedia(ctx, portal.PortalKey, evt.GetID(), cm, false)
}
+ } else if len(cm.Parts) > 0 && cacheMessage != "" {
+ evt.wa.Main.AddMediaEditCache(portal, cacheMessage, cm.Parts[0])
}
editPart := cm.Parts[0].ToEditPart(existing[0])
- if evt.isUndecryptableUpsertSubEvent {
+ if evt.isUndecryptableUpsertSubEvent || evt.dontRenderEdited {
if editPart.TopLevelExtra == nil {
editPart.TopLevelExtra = make(map[string]any)
}
diff --git a/pkg/connector/example-config.yaml b/pkg/connector/example-config.yaml
index e441f67..564f25e 100644
--- a/pkg/connector/example-config.yaml
+++ b/pkg/connector/example-config.yaml
@@ -121,3 +121,6 @@ history_sync:
request_local_time: 120
# Maximum number of media request responses to handle in parallel per user.
max_async_handle: 2
+ # Use on-demand history sync requests for fetching older messages?
+ # This only applies when using the backfill queue, never for forward backfills.
+ backwards_on_demand: false
diff --git a/pkg/connector/handlematrix.go b/pkg/connector/handlematrix.go
index a330a98..299449f 100644
--- a/pkg/connector/handlematrix.go
+++ b/pkg/connector/handlematrix.go
@@ -48,11 +48,12 @@ var (
_ bridgev2.DeleteChatHandlingNetworkAPI = (*WhatsAppClient)(nil)
)
-func (wa *WhatsAppClient) HandleMatrixPollStart(ctx context.Context, msg *bridgev2.MatrixPollStart) (*bridgev2.MatrixMessageResponse, error) {
+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, 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)
if err != nil {
return nil, err
@@ -67,19 +68,21 @@ func (wa *WhatsAppClient) HandleMatrixPollStart(ctx context.Context, msg *bridge
return resp, nil
}
-func (wa *WhatsAppClient) HandleMatrixPollVote(ctx context.Context, msg *bridgev2.MatrixPollVote) (*bridgev2.MatrixMessageResponse, error) {
+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, fmt.Errorf("failed to convert poll vote: %w", err)
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
return wa.handleConvertedMatrixMessage(ctx, &msg.MatrixMessage, waMsg, nil)
}
-func (wa *WhatsAppClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.MatrixMessage) (*bridgev2.MatrixMessageResponse, error) {
+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, fmt.Errorf("failed to convert message: %w", err)
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
return wa.handleConvertedMatrixMessage(ctx, msg, waMsg, req)
}
@@ -107,6 +110,7 @@ func (wa *WhatsAppClient) handleConvertedMatrixMessage(ctx context.Context, msg
wrappedMsgID2 := waid.MakeMessageID(chatJID, wa.GetStore().GetLID(), req.ID)
msg.AddPendingToIgnore(networkid.TransactionID(wrappedMsgID))
msg.AddPendingToIgnore(networkid.TransactionID(wrappedMsgID2))
+ zerolog.Ctx(ctx).Trace().Any("payload", waMsg).Msg("Outgoing message payload")
resp, err := wa.Client.SendMessage(ctx, chatJID, waMsg, *req)
if err != nil {
return nil, err
@@ -153,7 +157,7 @@ func (wa *WhatsAppClient) PreHandleMatrixReaction(_ context.Context, msg *bridge
}, nil
}
-func (wa *WhatsAppClient) HandleMatrixReaction(ctx context.Context, msg *bridgev2.MatrixReaction) (*database.Reaction, error) {
+func (wa *WhatsAppClient) HandleMatrixReaction(ctx context.Context, msg *bridgev2.MatrixReaction) (result *database.Reaction, retErr error) {
messageID, err := waid.ParseMessageID(msg.TargetMessage.ID)
if err != nil {
return nil, fmt.Errorf("failed to parse target message ID: %w", err)
@@ -170,6 +174,7 @@ func (wa *WhatsAppClient) HandleMatrixReaction(ctx context.Context, msg *bridgev
SenderTimestampMS: proto.Int64(msg.Event.Timestamp),
},
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
var req whatsmeow.SendRequestExtra
if msg.Portal.Metadata.(*waid.PortalMetadata).CommunityAnnouncementGroup {
reactionMsg.EncReactionMessage, err = wa.Client.EncryptReaction(ctx, msgconv.MessageIDToInfo(wa.Client, messageID), reactionMsg.ReactionMessage)
@@ -191,7 +196,7 @@ func (wa *WhatsAppClient) HandleMatrixReaction(ctx context.Context, msg *bridgev
}, err
}
-func (wa *WhatsAppClient) HandleMatrixReactionRemove(ctx context.Context, msg *bridgev2.MatrixReactionRemove) error {
+func (wa *WhatsAppClient) HandleMatrixReactionRemove(ctx context.Context, msg *bridgev2.MatrixReactionRemove) (retErr error) {
messageID, err := waid.ParseMessageID(msg.TargetReaction.MessageID)
if err != nil {
return fmt.Errorf("failed to parse target message ID: %w", err)
@@ -215,12 +220,13 @@ func (wa *WhatsAppClient) HandleMatrixReactionRemove(ctx context.Context, msg *b
extra.ID = types.MessageID(msg.InputTransactionID)
}
+ 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 err
}
-func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.MatrixEdit) error {
+func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.MatrixEdit) (retErr error) {
log := zerolog.Ctx(ctx)
var editID types.MessageID
@@ -244,6 +250,8 @@ func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.M
if err != nil {
return fmt.Errorf("failed to convert message: %w", err)
}
+ defer wa.mcTrack(edit, time.Now(), &retErr)
+
convertedEdit := wa.Client.BuildEdit(messageID.Chat, messageID.ID, waMsg)
if edit.OrigSender == nil {
convertedEdit.EditedMessage.Message.ProtocolMessage.TimestampMS = proto.Int64(edit.Event.Timestamp)
@@ -258,7 +266,7 @@ func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.M
return err
}
-func (wa *WhatsAppClient) HandleMatrixMessageRemove(ctx context.Context, msg *bridgev2.MatrixMessageRemove) error {
+func (wa *WhatsAppClient) HandleMatrixMessageRemove(ctx context.Context, msg *bridgev2.MatrixMessageRemove) (retErr error) {
log := zerolog.Ctx(ctx)
messageID, err := waid.ParseMessageID(msg.TargetMessage.ID)
if err != nil {
@@ -270,6 +278,7 @@ func (wa *WhatsAppClient) HandleMatrixMessageRemove(ctx context.Context, msg *br
return fmt.Errorf("failed to parse portal ID: %w", err)
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
revokeMessage := wa.Client.BuildRevoke(messageID.Chat, messageID.Sender, messageID.ID)
extra := whatsmeow.SendRequestExtra{}
@@ -282,7 +291,7 @@ func (wa *WhatsAppClient) HandleMatrixMessageRemove(ctx context.Context, msg *br
return err
}
-func (wa *WhatsAppClient) HandleMatrixReadReceipt(ctx context.Context, receipt *bridgev2.MatrixReadReceipt) error {
+func (wa *WhatsAppClient) HandleMatrixReadReceipt(ctx context.Context, receipt *bridgev2.MatrixReadReceipt) (retErr error) {
if !receipt.ReadUpTo.After(receipt.LastRead) {
return nil
}
@@ -321,6 +330,7 @@ func (wa *WhatsAppClient) HandleMatrixReadReceipt(ctx context.Context, receipt *
}
messagesToRead[key] = append(messagesToRead[key], parsed.ID)
}
+ defer wa.mcTrack(receipt, time.Now(), &retErr)
for messageSender, ids := range messagesToRead {
err = wa.Client.MarkRead(ctx, ids, receipt.Receipt.Timestamp, portalJID, messageSender)
if err != nil {
@@ -330,7 +340,7 @@ func (wa *WhatsAppClient) HandleMatrixReadReceipt(ctx context.Context, receipt *
return err
}
-func (wa *WhatsAppClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.MatrixTyping) error {
+func (wa *WhatsAppClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.MatrixTyping) (retErr error) {
portalJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return err
@@ -351,6 +361,7 @@ func (wa *WhatsAppClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.
return nil
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
if wa.Main.Config.SendPresenceOnTyping {
err = wa.updatePresence(ctx, types.PresenceAvailable)
if err != nil {
@@ -362,7 +373,7 @@ func (wa *WhatsAppClient) HandleMatrixTyping(ctx context.Context, msg *bridgev2.
var errUnsupportedDisappearingTimer = bridgev2.WrapErrorInStatus(errors.New("invalid value for disappearing timer")).WithErrorAsMessage().WithIsCertain(true).WithSendNotice(true)
-func (wa *WhatsAppClient) HandleMatrixDisappearingTimer(ctx context.Context, msg *bridgev2.MatrixDisappearingTimer) (bool, error) {
+func (wa *WhatsAppClient) HandleMatrixDisappearingTimer(ctx context.Context, msg *bridgev2.MatrixDisappearingTimer) (ok bool, retErr error) {
portalJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return false, err
@@ -374,6 +385,7 @@ func (wa *WhatsAppClient) HandleMatrixDisappearingTimer(ctx context.Context, msg
return false, fmt.Errorf("%w (%s)", errUnsupportedDisappearingTimer, msg.Content.Timer.Duration)
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
settingTS := time.UnixMilli(msg.Event.Timestamp)
err = wa.Client.SetDisappearingTimer(ctx, portalJID, msg.Content.Timer.Duration, settingTS)
if err != nil {
@@ -390,7 +402,11 @@ func (wa *WhatsAppClient) HandleMatrixDisappearingTimer(ctx context.Context, msg
return true, nil
}
-func (wa *WhatsAppClient) HandleMatrixMembership(ctx context.Context, msg *bridgev2.MatrixMembershipChange) (*bridgev2.MatrixMembershipResult, error) {
+func (wa *WhatsAppClient) HandleMatrixMembership(ctx context.Context, msg *bridgev2.MatrixMembershipChange) (result *bridgev2.MatrixMembershipResult, retErr error) {
+ if msg.Type.IsSelf && msg.OrigSender != nil {
+ return nil, nil
+ }
+
portalJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return nil, err
@@ -430,6 +446,7 @@ func (wa *WhatsAppClient) HandleMatrixMembership(ctx context.Context, msg *bridg
return nil, fmt.Errorf("cannot get target intent: unknown type: %T", target)
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
resp, err := wa.Client.UpdateGroupParticipants(ctx, portalJID, changes, action)
if err != nil {
return nil, err
@@ -445,7 +462,7 @@ func (wa *WhatsAppClient) HandleMatrixMembership(ctx context.Context, msg *bridg
return &bridgev2.MatrixMembershipResult{RedirectTo: waid.MakeUserID(resp[0].JID)}, nil
}
-func (wa *WhatsAppClient) HandleMatrixRoomName(ctx context.Context, msg *bridgev2.MatrixRoomName) (bool, error) {
+func (wa *WhatsAppClient) HandleMatrixRoomName(ctx context.Context, msg *bridgev2.MatrixRoomName) (ok bool, retErr error) {
portalJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return false, err
@@ -455,6 +472,7 @@ func (wa *WhatsAppClient) HandleMatrixRoomName(ctx context.Context, msg *bridgev
return false, fmt.Errorf("cannot set room name for DM")
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
err = wa.Client.SetGroupName(ctx, portalJID, msg.Content.Name)
if err != nil {
return false, err
@@ -466,7 +484,7 @@ func (wa *WhatsAppClient) HandleMatrixRoomName(ctx context.Context, msg *bridgev
return true, nil
}
-func (wa *WhatsAppClient) HandleMatrixRoomTopic(ctx context.Context, msg *bridgev2.MatrixRoomTopic) (bool, error) {
+func (wa *WhatsAppClient) HandleMatrixRoomTopic(ctx context.Context, msg *bridgev2.MatrixRoomTopic) (ok bool, retErr error) {
portalJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return false, err
@@ -476,6 +494,7 @@ func (wa *WhatsAppClient) HandleMatrixRoomTopic(ctx context.Context, msg *bridge
return false, fmt.Errorf("cannot set room topic for DM")
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
newID := wa.Client.GenerateMessageID()
oldID := msg.Portal.Metadata.(*waid.PortalMetadata).TopicID
err = wa.Client.SetGroupTopic(ctx, portalJID, oldID, newID, msg.Content.Topic)
@@ -490,7 +509,7 @@ func (wa *WhatsAppClient) HandleMatrixRoomTopic(ctx context.Context, msg *bridge
return true, nil
}
-func (wa *WhatsAppClient) HandleMatrixRoomAvatar(ctx context.Context, msg *bridgev2.MatrixRoomAvatar) (bool, error) {
+func (wa *WhatsAppClient) HandleMatrixRoomAvatar(ctx context.Context, msg *bridgev2.MatrixRoomAvatar) (ok bool, retErr error) {
portalJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return false, err
@@ -513,6 +532,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, err
@@ -580,7 +600,7 @@ func convertRoomAvatar(data []byte) ([]byte, error) {
return buf.Bytes(), nil
}
-func (wa *WhatsAppClient) HandleMute(ctx context.Context, msg *bridgev2.MatrixMute) error {
+func (wa *WhatsAppClient) HandleMute(ctx context.Context, msg *bridgev2.MatrixMute) (retErr error) {
chatJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return err
@@ -591,14 +611,16 @@ func (wa *WhatsAppClient) HandleMute(ctx context.Context, msg *bridgev2.MatrixMu
if !muted || mutedUntil == event.MutedForever {
muteTS = nil
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
return wa.Client.SendAppState(ctx, appstate.BuildMuteAbs(chatJID, muted, muteTS))
}
-func (wa *WhatsAppClient) HandleRoomTag(ctx context.Context, msg *bridgev2.MatrixRoomTag) error {
+func (wa *WhatsAppClient) HandleRoomTag(ctx context.Context, msg *bridgev2.MatrixRoomTag) (retErr error) {
chatJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return err
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
_, isFavorite := msg.Content.Tags[event.RoomTagFavourite]
return wa.Client.SendAppState(ctx, appstate.BuildPin(chatJID, isFavorite))
}
@@ -630,7 +652,7 @@ func (wa *WhatsAppClient) getLastMessageInfo(ctx context.Context, chatJID types.
return lastTS, lastKey, nil
}
-func (wa *WhatsAppClient) HandleMarkedUnread(ctx context.Context, msg *bridgev2.MatrixMarkedUnread) error {
+func (wa *WhatsAppClient) HandleMarkedUnread(ctx context.Context, msg *bridgev2.MatrixMarkedUnread) (retErr error) {
chatJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return err
@@ -639,10 +661,11 @@ func (wa *WhatsAppClient) HandleMarkedUnread(ctx context.Context, msg *bridgev2.
if err != nil {
return err
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
return wa.Client.SendAppState(ctx, appstate.BuildMarkChatAsRead(chatJID, msg.Content.Unread, lastTS, lastKey))
}
-func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridgev2.MatrixDeleteChat) error {
+func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridgev2.MatrixDeleteChat) (retErr error) {
chatJID, err := waid.ParsePortalID(msg.Portal.ID)
if err != nil {
return err
@@ -663,5 +686,6 @@ func (wa *WhatsAppClient) HandleMatrixDeleteChat(ctx context.Context, msg *bridg
if err != nil {
return err
}
+ defer wa.mcTrack(msg, time.Now(), &retErr)
return wa.Client.SendAppState(ctx, appstate.BuildDeleteChat(chatJID, lastTS, lastKey, true))
}
diff --git a/pkg/connector/handlewhatsapp.go b/pkg/connector/handlewhatsapp.go
index eb42f43..2b9b145 100644
--- a/pkg/connector/handlewhatsapp.go
+++ b/pkg/connector/handlewhatsapp.go
@@ -28,7 +28,6 @@ import (
"go.mau.fi/whatsmeow"
"go.mau.fi/whatsmeow/appstate"
"go.mau.fi/whatsmeow/proto/waE2E"
- "go.mau.fi/whatsmeow/store"
"go.mau.fi/whatsmeow/types"
"go.mau.fi/whatsmeow/types/events"
"maunium.net/go/mautrix/bridgev2"
@@ -77,6 +76,7 @@ func init() {
func (wa *WhatsAppClient) handleWAEvent(rawEvt any) (success bool) {
log := wa.UserLogin.Log
ctx := log.WithContext(wa.Main.Bridge.BackgroundCtx)
+ wa.MC.OnWhatsAppEvent(rawEvt)
success = true
switch evt := rawEvt.(type) {
@@ -126,6 +126,20 @@ func (wa *WhatsAppClient) handleWAEvent(rawEvt any) (success bool) {
success = wa.handleWANewsletterLeave(evt)
case *events.Picture:
success = wa.handleWAPictureUpdate(ctx, evt)
+ case *events.NotifyAccountReachoutTimelock:
+ wa.UserLogin.TrackAnalytics("WhatsApp Account Reachout Timelock", map[string]any{
+ "enforcement_type": evt.EnforcementType,
+ "is_active": evt.IsActive,
+ "time_enforcement_ends": evt.TimeEnforcementEnds.Time,
+ })
+ wa.UserLogin.Metadata.(*waid.UserLoginMetadata).ReachoutTimelockUntil = evt.TimeEnforcementEnds.Time
+ if wa.UserLogin.BridgeState.GetPrevUnsent().StateEvent == status.StateConnected {
+ wa.UserLogin.BridgeState.Send(status.BridgeState{StateEvent: status.StateConnected})
+ }
+ err := wa.UserLogin.Save(ctx)
+ if err != nil {
+ log.Err(err).Msg("Failed to save user login metadata after reachout timelock update")
+ }
case *events.AppStateSyncComplete:
wa.handleWAAppStateSyncComplete(ctx, evt)
@@ -168,7 +182,6 @@ func (wa *WhatsAppClient) handleWAEvent(rawEvt any) (success bool) {
}()
go wa.syncRemoteProfile(ctx, nil)
}
- wa.MC.OnConnect(store.GetWAVersion()[2], wa.Device.Platform)
case *events.OfflineSyncPreview:
log.Info().
Int("message_count", evt.Messages).
@@ -309,52 +322,10 @@ func (wa *WhatsAppClient) rerouteWAMessage(ctx context.Context, evtType string,
func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Message) (success bool) {
success = true
- wa.rerouteWAMessage(ctx, "message", &evt.Info.MessageSource, evt.Info.ID)
- wa.UserLogin.Log.Trace().
- Any("info", evt.Info).
- Any("payload", evt.Message).
- Msg("Received WhatsApp message")
if evt.Info.Chat == types.StatusBroadcastJID && !wa.Main.Config.EnableStatusBroadcast {
return
}
- if evt.Info.IsFromMe &&
- evt.Message.GetProtocolMessage().GetHistorySyncNotification() != nil &&
- wa.Main.Bridge.Config.Backfill.Enabled &&
- wa.Client.ManualHistorySyncDownload {
- wa.saveWAHistorySyncNotification(ctx, evt.Message.ProtocolMessage.HistorySyncNotification)
- }
-
- messageAssoc := evt.Message.GetMessageContextInfo().GetMessageAssociation()
- if assocType := messageAssoc.GetAssociationType(); assocType == waE2E.MessageAssociation_HD_IMAGE_DUAL_UPLOAD || assocType == waE2E.MessageAssociation_HD_VIDEO_DUAL_UPLOAD {
- parentKey := messageAssoc.GetParentMessageKey()
- associatedMessage := evt.Message.GetAssociatedChildMessage().GetMessage()
- wa.UserLogin.Log.Debug().
- Str("message_id", evt.Info.ID).
- Str("parent_id", parentKey.GetID()).
- Stringer("assoc_type", assocType).
- Msg("Received HD replacement message, converting to edit")
-
- protocolMsg := &waE2E.ProtocolMessage{
- Type: waE2E.ProtocolMessage_MESSAGE_EDIT.Enum(),
- Key: parentKey,
- EditedMessage: associatedMessage,
- }
- evt.Message = &waE2E.Message{
- ProtocolMessage: protocolMsg,
- }
- } else if assocType == waE2E.MessageAssociation_MOTION_PHOTO {
- //evt.Message = evt.Message.GetAssociatedChildMessage().GetMessage()
- wa.UserLogin.Log.Debug().
- Str("message_id", evt.Info.ID).
- Str("parent_id", messageAssoc.GetParentMessageKey().GetID()).
- Msg("Ignoring motion photo update")
- return
- }
-
parsedMessageType := getMessageType(evt.Message)
- if parsedMessageType == "ignore" || strings.HasPrefix(parsedMessageType, "unknown_protocol_") {
- return
- }
if encReact := evt.Message.GetEncReactionMessage(); encReact != nil {
decrypted, err := wa.Client.DecryptReaction(ctx, evt)
if err != nil {
@@ -376,13 +347,66 @@ func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Messa
if encMessage := evt.Message.GetSecretEncryptedMessage(); encMessage != nil {
decrypted, err := wa.Client.DecryptSecretEncryptedMessage(ctx, evt)
if err != nil {
- wa.UserLogin.Log.Err(err).Str("message_id", evt.Info.ID).Msg("Failed to decrypt message")
+ wa.UserLogin.Log.Err(err).
+ Str("message_id", evt.Info.ID).
+ Stringer("evt_sender", evt.Info.Sender).
+ Any("target_message_key", encMessage.TargetMessageKey).
+ Msg("Failed to decrypt secret-encrypted message")
return
}
evt.RawMessage = decrypted
evt.UnwrapRaw()
parsedMessageType = getMessageType(evt.Message)
}
+ wa.rerouteWAMessage(ctx, "message", &evt.Info.MessageSource, evt.Info.ID)
+ wa.UserLogin.Log.Trace().
+ Any("info", evt.Info).
+ Any("payload", evt.Message).
+ Msg("Received WhatsApp message")
+ if evt.Info.IsFromMe &&
+ evt.Message.GetProtocolMessage().GetHistorySyncNotification() != nil &&
+ wa.Main.Bridge.Config.Backfill.Enabled {
+ wa.saveWAHistorySyncNotification(ctx, evt.Message.ProtocolMessage.HistorySyncNotification)
+ }
+ if parsedMessageType == "ignore" || strings.HasPrefix(parsedMessageType, "unknown_protocol_") {
+ return
+ }
+
+ dontRenderEdited := false
+ messageAssoc := evt.Message.GetMessageContextInfo().GetMessageAssociation()
+ if assocType := messageAssoc.GetAssociationType(); assocType == waE2E.MessageAssociation_HD_IMAGE_DUAL_UPLOAD || assocType == waE2E.MessageAssociation_HD_VIDEO_DUAL_UPLOAD {
+ parentKey := messageAssoc.GetParentMessageKey()
+ protocolMsg := evt.Message.GetProtocolMessage()
+ if protocolMsg.GetType() != waE2E.ProtocolMessage_MESSAGE_EDIT || protocolMsg.GetKey() == nil {
+ protocolMsg = &waE2E.ProtocolMessage{
+ Type: waE2E.ProtocolMessage_MESSAGE_EDIT.Enum(),
+ Key: parentKey,
+ EditedMessage: evt.Message.GetAssociatedChildMessage().GetMessage(),
+ }
+ dontRenderEdited = true
+ } else if child := protocolMsg.GetEditedMessage().GetAssociatedChildMessage().GetMessage(); child != nil {
+ protocolMsg.EditedMessage = child
+ protocolMsg.Key = parentKey
+ }
+ wa.UserLogin.Log.Debug().
+ Str("message_id", evt.Info.ID).
+ Str("parent_id", parentKey.GetID()).
+ Stringer("assoc_type", assocType).
+ Msg("Received HD replacement message, converting to edit")
+
+ evt.Message = &waE2E.Message{
+ ProtocolMessage: protocolMsg,
+ }
+ parsedMessageType = getMessageType(evt.Message)
+ } else if assocType == waE2E.MessageAssociation_MOTION_PHOTO {
+ //evt.Message = evt.Message.GetAssociatedChildMessage().GetMessage()
+ wa.UserLogin.Log.Debug().
+ Str("message_id", evt.Info.ID).
+ Str("parent_id", messageAssoc.GetParentMessageKey().GetID()).
+ Msg("Ignoring motion photo update")
+ return
+ }
+
res := wa.UserLogin.QueueRemoteEvent(&WAMessageEvent{
MessageInfoWrapper: &MessageInfoWrapper{
Info: evt.Info,
@@ -392,6 +416,7 @@ func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Messa
MsgEvent: evt,
parsedMessageType: parsedMessageType,
+ dontRenderEdited: dontRenderEdited,
})
return res.Success
}
diff --git a/pkg/connector/login.go b/pkg/connector/login.go
index 88e7b75..5da419f 100644
--- a/pkg/connector/login.go
+++ b/pkg/connector/login.go
@@ -2,6 +2,7 @@ package connector
import (
"context"
+ "encoding/json"
"errors"
"fmt"
"net/http"
@@ -12,6 +13,7 @@ import (
"go.mau.fi/util/exsync"
"go.mau.fi/util/jsontime"
"go.mau.fi/whatsmeow"
+ "go.mau.fi/whatsmeow/types"
"go.mau.fi/whatsmeow/types/events"
waLog "go.mau.fi/whatsmeow/util/log"
"maunium.net/go/mautrix/bridgev2"
@@ -25,6 +27,7 @@ const (
LoginStepIDQR = "fi.mau.whatsapp.login.qr"
LoginStepIDPhoneNumber = "fi.mau.whatsapp.login.phone"
LoginStepIDCode = "fi.mau.whatsapp.login.code"
+ LoginStepIDPasskey = "fi.mau.whatsapp.login.passkey"
LoginStepIDComplete = "fi.mau.whatsapp.login.complete"
LoginFlowIDQR = "qr"
@@ -76,8 +79,8 @@ var (
}
ErrRateLimitedByWhatsApp = bridgev2.RespError{
ErrCode: "FI.MAU.WHATSAPP.RATE_LIMITED",
- Err: "Rate limited by WhatsApp",
- StatusCode: http.StatusTooManyRequests,
+ Err: "Rate limited by WhatsApp. Try again later.",
+ StatusCode: http.StatusBadRequest,
}
)
@@ -91,9 +94,11 @@ func (wa *WhatsAppConnector) CreateLogin(_ context.Context, user *bridgev2.User,
Bool("phone_code", flowID == LoginFlowIDPhone).
Logger(),
- WaitForQRs: exsync.NewEvent(),
- LoginComplete: exsync.NewEvent(),
- Received515: exsync.NewEvent(),
+ WaitForQRs: exsync.NewEvent(),
+ LoginComplete: exsync.NewEvent(),
+ PasskeyRequest: exsync.NewEvent(),
+ PasskeyConfirmation: exsync.NewEvent(),
+ Received515: exsync.NewEvent(),
}, nil
}
@@ -114,6 +119,11 @@ type WALogin struct {
Received515 *exsync.Event
PrevQRIndex atomic.Int32
+ PasskeyRequest *exsync.Event
+ PasskeyRequestData *events.PairPasskeyRequest
+ PasskeyConfirmation *exsync.Event
+ PasskeyConfirmationData *events.PairPasskeyConfirmation
+
Closed atomic.Bool
EventHandlerID uint32
}
@@ -122,6 +132,7 @@ var (
_ bridgev2.LoginProcessDisplayAndWait = (*WALogin)(nil)
_ bridgev2.LoginProcessUserInput = (*WALogin)(nil)
_ bridgev2.LoginProcessWithOverride = (*WALogin)(nil)
+ _ bridgev2.LoginProcessWebAuthn = (*WALogin)(nil)
)
const LoginConnectWait = 15 * time.Second
@@ -262,6 +273,17 @@ func (wl *WALogin) handleEvent(rawEvt any) {
case *events.ClientOutdated:
wl.Log.Error().Msg("Got client outdated error")
wl.LoginError = ErrLoginClientOutdated
+ case *events.PairPasskeyRequest:
+ wl.PasskeyRequestData = evt
+ wl.PasskeyRequest.Set()
+ return
+ case *events.PairPasskeyConfirmation:
+ wl.PasskeyConfirmationData = evt
+ wl.PasskeyConfirmation.Set()
+ return
+ case *events.PairPasskeyError:
+ wl.Log.Err(evt.Error).Msg("Got passkey error")
+ wl.LoginError = evt.Error
case *events.PairSuccess:
wl.Log.Info().Any("event_data", evt).Msg("Got pair successful event")
wl.LoginSuccess = evt
@@ -289,10 +311,14 @@ func (wl *WALogin) handleEvent(rawEvt any) {
func (wl *WALogin) Wait(ctx context.Context) (*bridgev2.LoginStep, error) {
if wl.PhoneCode {
- err := wl.LoginComplete.Wait(ctx)
- if err != nil {
+ select {
+ case <-ctx.Done():
wl.Cancel()
- return nil, err
+ return nil, ctx.Err()
+ case <-wl.PasskeyRequest.GetChan():
+ return wl.makePasskeyStep()
+ case <-wl.LoginComplete.GetChan():
+ // continue
}
} else {
prevIndex := int(wl.PrevQRIndex.Load())
@@ -319,9 +345,16 @@ func (wl *WALogin) Wait(ctx context.Context) (*bridgev2.LoginStep, error) {
case <-ctx.Done():
wl.Cancel()
return nil, ctx.Err()
+ case <-wl.PasskeyRequest.GetChan():
+ return wl.makePasskeyStep()
case <-wl.LoginComplete.GetChan():
+ // continue
}
}
+ return wl.onLoginComplete(ctx)
+}
+
+func (wl *WALogin) onLoginComplete(ctx context.Context) (*bridgev2.LoginStep, error) {
if wl.LoginError != nil {
wl.Log.Debug().Err(wl.LoginError).Msg("Login completed with error")
wl.Cancel()
@@ -372,6 +405,66 @@ func (wl *WALogin) Wait(ctx context.Context) (*bridgev2.LoginStep, error) {
}, nil
}
+func (wl *WALogin) makePasskeyStep() (*bridgev2.LoginStep, error) {
+ pubkeyData, err := json.Marshal(wl.PasskeyRequestData.PublicKey)
+ if err != nil {
+ wl.Log.Err(err).Msg("Failed to marshal public key data")
+ return nil, err
+ }
+ return &bridgev2.LoginStep{
+ Type: bridgev2.LoginStepTypeWebAuthn,
+ StepID: LoginStepIDPasskey,
+ WebAuthnParams: &bridgev2.LoginWebAuthnParams{
+ URL: "https://web.whatsapp.com",
+ PublicKey: pubkeyData,
+ },
+ }, nil
+}
+
+func (wl *WALogin) SubmitWebAuthnResponse(ctx context.Context, rawResp json.RawMessage) (*bridgev2.LoginStep, error) {
+ var resp types.WebAuthnResponse
+ err := json.Unmarshal(rawResp, &resp)
+ if err != nil {
+ wl.Log.Err(err).Msg("Failed to unmarshal WebAuthn response")
+ wl.Cancel()
+ return nil, err
+ }
+ err = wl.Client.SendPasskeyResponse(ctx, &resp)
+ if err != nil {
+ wl.Log.Err(err).Msg("Failed to send WebAuthn response")
+ wl.Cancel()
+ return nil, err
+ }
+ select {
+ case <-ctx.Done():
+ wl.Cancel()
+ return nil, ctx.Err()
+ case <-wl.PasskeyConfirmation.GetChan():
+ if !wl.PasskeyConfirmationData.SkipHandoffUX {
+ wl.Cancel()
+ return nil, bridgev2.RespError{
+ ErrCode: "FI.MAU.WHATSAPP.NOT_IMPLEMENTED",
+ Err: "Displaying WebAuthn pairing confirmation codes is not yet implemented",
+ StatusCode: http.StatusBadRequest,
+ }
+ }
+ err = wl.Client.SendPasskeyConfirmation(ctx)
+ if err != nil {
+ wl.Log.Err(err).Msg("Failed to send WebAuthn confirmation")
+ wl.Cancel()
+ return nil, err
+ }
+ case <-wl.LoginComplete.GetChan():
+ }
+ select {
+ case <-ctx.Done():
+ wl.Cancel()
+ return nil, ctx.Err()
+ case <-wl.LoginComplete.GetChan():
+ }
+ return wl.onLoginComplete(ctx)
+}
+
func (wl *WALogin) Cancel() {
wl.Closed.Store(true)
wl.Client.RemoveEventHandler(wl.EventHandlerID)
diff --git a/pkg/connector/mclient.go b/pkg/connector/mclient.go
index 0930617..f85545a 100644
--- a/pkg/connector/mclient.go
+++ b/pkg/connector/mclient.go
@@ -21,6 +21,7 @@ import (
"encoding/json"
"time"
+ "go.mau.fi/util/ptr"
"go.mau.fi/whatsmeow"
waBinary "go.mau.fi/whatsmeow/binary"
"go.mau.fi/whatsmeow/types"
@@ -39,14 +40,16 @@ func (wa *WhatsAppClient) initMC() {
}
type mClient = interface {
- OnConnect(version uint32, platform string)
+ OnMatrixEvent(any, time.Duration, error)
+ OnWhatsAppEvent(any)
}
type noopMC struct{}
var noopMCInstance mClient = &noopMC{}
-func (n *noopMC) OnConnect(version uint32, platform string) {}
+func (n *noopMC) OnMatrixEvent(any, time.Duration, error) {}
+func (n *noopMC) OnWhatsAppEvent(any) {}
type mWAClient = interface {
MSend(data []byte)
@@ -79,3 +82,7 @@ func (wa *WhatsAppClient) MSave(s json.RawMessage) {
wa.UserLogin.Log.Err(err).Msg("Failed to save MC data")
}
}
+
+func (wa *WhatsAppClient) mcTrack(evt any, start time.Time, err *error) {
+ wa.MC.OnMatrixEvent(evt, time.Since(start), ptr.Val(err))
+}
diff --git a/pkg/connector/mediarequest.go b/pkg/connector/mediarequest.go
index 2c382d1..2686250 100644
--- a/pkg/connector/mediarequest.go
+++ b/pkg/connector/mediarequest.go
@@ -70,10 +70,9 @@ func (wa *WhatsAppClient) processFailedMedia(ctx context.Context, portalKey netw
func (wa *WhatsAppClient) mediaRequestLoop(ctx context.Context) {
log := wa.UserLogin.Log.With().Str("loop", "media requests").Logger()
ctx = log.WithContext(ctx)
- tzName := wa.UserLogin.Metadata.(*waid.UserLoginMetadata).Timezone
- userTz, err := time.LoadLocation(tzName)
+ userTz, err := wa.UserLogin.Metadata.(*waid.UserLoginMetadata).LoadTimezone()
var startIn time.Duration
- if tzName != "" && err == nil && userTz != nil {
+ if err == nil && userTz != nil {
now := time.Now()
startAt := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, userTz)
startAt = startAt.Add(time.Duration(wa.Main.Config.HistorySync.MediaRequests.RequestLocalTime) * time.Minute)
diff --git a/pkg/connector/phoneping.go b/pkg/connector/phoneping.go
index ce38079..71094c9 100644
--- a/pkg/connector/phoneping.go
+++ b/pkg/connector/phoneping.go
@@ -37,6 +37,13 @@ func (wa *WhatsAppClient) FillBridgeState(state status.BridgeState) status.Bridg
state.Error = WAPhoneOffline
state.UserAction = status.UserActionOpenNative
}
+ rtu := wa.UserLogin.Metadata.(*waid.UserLoginMetadata).ReachoutTimelockUntil
+ if !rtu.IsZero() {
+ if state.Info == nil {
+ state.Info = make(map[string]any)
+ }
+ state.Info["reachout_timelock_until"] = rtu
+ }
return state
}
diff --git a/pkg/connector/userinfo.go b/pkg/connector/userinfo.go
index aa84938..e827955 100644
--- a/pkg/connector/userinfo.go
+++ b/pkg/connector/userinfo.go
@@ -29,7 +29,8 @@ var ResyncLoopInterval = 4 * time.Hour
var ResyncJitterSeconds = 3600
func (wa *WhatsAppClient) EnqueueGhostResync(ghost *bridgev2.Ghost) {
- if ghost.Metadata.(*waid.GhostMetadata).LastSync.Add(ResyncMinInterval).After(time.Now()) {
+ lastSync := ghost.Metadata.(*waid.GhostMetadata).LastSync.Time
+ if lastSync.Add(ResyncMinInterval).After(time.Now()) {
return
}
wa.resyncQueueLock.Lock()
@@ -43,6 +44,7 @@ func (wa *WhatsAppClient) EnqueueGhostResync(ghost *bridgev2.Ghost) {
wa.UserLogin.Log.Debug().
Stringer("jid", jid).
Str("next_resync_in", nextResyncIn).
+ Time("last_ghost_resync", lastSync).
Msg("Enqueued resync for ghost")
}
wa.resyncQueueLock.Unlock()
@@ -50,7 +52,8 @@ func (wa *WhatsAppClient) EnqueueGhostResync(ghost *bridgev2.Ghost) {
func (wa *WhatsAppClient) EnqueuePortalResync(portal *bridgev2.Portal, allowDM bool) {
jid, _ := waid.ParsePortalID(portal.ID)
- if portal.Metadata.(*waid.PortalMetadata).LastSync.Add(ResyncMinInterval).After(time.Now()) {
+ lastSync := portal.Metadata.(*waid.PortalMetadata).LastSync.Time
+ if lastSync.Add(ResyncMinInterval).After(time.Now()) {
return
} else if !allowDM && jid.Server != types.GroupServer {
return
@@ -61,6 +64,7 @@ func (wa *WhatsAppClient) EnqueuePortalResync(portal *bridgev2.Portal, allowDM b
wa.UserLogin.Log.Debug().
Stringer("jid", jid).
Stringer("next_resync_in", time.Until(wa.nextResync)).
+ Time("last_portal_resync", lastSync).
Msg("Enqueued resync for portal")
}
wa.resyncQueueLock.Unlock()
@@ -357,7 +361,7 @@ func (wa *WhatsAppClient) fetchGhostAvatar(ctx context.Context, ghost *bridgev2.
wrappedAvatar = &bridgev2.Avatar{
ID: networkid.AvatarID(avatar.ID),
Get: func(ctx context.Context) ([]byte, error) {
- return wa.Client.DownloadMediaWithPath(ctx, avatar.DirectPath, nil, nil, nil, 0, "", "")
+ return wa.Client.DownloadMediaWithOnlyPath(ctx, avatar.DirectPath)
},
}
}
diff --git a/pkg/connector/wadb/message.go b/pkg/connector/wadb/message.go
index f2450c1..4b16002 100644
--- a/pkg/connector/wadb/message.go
+++ b/pkg/connector/wadb/message.go
@@ -116,9 +116,12 @@ func (mq *MessageQuery) GetBetween(ctx context.Context, loginID networkid.UserLo
AsList()
}
-func (mq *MessageQuery) DeleteBetween(ctx context.Context, loginID networkid.UserLoginID, chatJID types.JID, before, after uint64) error {
- _, err := mq.Exec(ctx, deleteHistorySyncMessagesBetweenQuery, mq.BridgeID, loginID, chatJID, before, after)
- return err
+func (mq *MessageQuery) DeleteBetween(ctx context.Context, loginID networkid.UserLoginID, chatJID types.JID, before, after uint64) (int64, error) {
+ res, err := mq.Exec(ctx, deleteHistorySyncMessagesBetweenQuery, mq.BridgeID, loginID, chatJID, before, after)
+ if err != nil {
+ return 0, err
+ }
+ return res.RowsAffected()
}
func (mq *MessageQuery) DeleteAll(ctx context.Context, loginID networkid.UserLoginID) error {
@@ -126,9 +129,12 @@ func (mq *MessageQuery) DeleteAll(ctx context.Context, loginID networkid.UserLog
return err
}
-func (mq *MessageQuery) DeleteAllInChat(ctx context.Context, loginID networkid.UserLoginID, chatJID types.JID) error {
- _, err := mq.Exec(ctx, deleteHistorySyncMessagesForPortalQuery, mq.BridgeID, loginID, chatJID)
- return err
+func (mq *MessageQuery) DeleteAllInChat(ctx context.Context, loginID networkid.UserLoginID, chatJID types.JID) (int64, error) {
+ res, err := mq.Exec(ctx, deleteHistorySyncMessagesForPortalQuery, mq.BridgeID, loginID, chatJID)
+ if err != nil {
+ return 0, err
+ }
+ return res.RowsAffected()
}
func (mq *MessageQuery) ConversationHasMessages(ctx context.Context, loginID networkid.UserLoginID, chatJID types.JID) (exists bool, err error) {
diff --git a/pkg/connector/wamsgtype.go b/pkg/connector/wamsgtype.go
index e716f5d..4bcf483 100644
--- a/pkg/connector/wamsgtype.go
+++ b/pkg/connector/wamsgtype.go
@@ -130,8 +130,6 @@ func getMessageType(waMsg *waE2E.Message) string {
return "secret encrypted"
case waMsg.PollResultSnapshotMessage != nil:
return "poll result snapshot"
- case waMsg.MessageHistoryBundle != nil:
- return "message history bundle"
case waMsg.MessageHistoryNotice != nil:
return "message history notice"
case waMsg.RequestPhoneNumberMessage != nil:
@@ -154,7 +152,7 @@ func getMessageType(waMsg *waE2E.Message) string {
return "chat"
case waMsg.PlaceholderMessage != nil:
return "placeholder"
- case waMsg.SenderKeyDistributionMessage != nil, waMsg.StickerSyncRmrMessage != nil:
+ case waMsg.SenderKeyDistributionMessage != nil, waMsg.StickerSyncRmrMessage != nil, waMsg.MessageHistoryBundle != nil:
return "ignore"
default:
return "unknown"
diff --git a/pkg/msgconv/from-matrix.go b/pkg/msgconv/from-matrix.go
index 49f6048..93de90c 100644
--- a/pkg/msgconv/from-matrix.go
+++ b/pkg/msgconv/from-matrix.go
@@ -19,6 +19,7 @@ package msgconv
import (
"bytes"
"context"
+ "encoding/base64"
"encoding/json"
"errors"
"fmt"
@@ -201,6 +202,7 @@ func (mc *MessageConverter) constructMediaMessage(
FileSHA256: uploaded.FileSHA256,
FileLength: proto.Uint64(uploaded.FileLength),
URL: proto.String(uploaded.URL),
+ IsLottie: proto.Bool(mime == "application/was"),
},
}
case event.MsgAudio:
@@ -482,6 +484,17 @@ func (mc *MessageConverter) convertToWebP(img []byte) ([]byte, int, error) {
return webpBuffer.Bytes(), size, nil
}
+func (mc *MessageConverter) getOriginalBridgedSticker(ctx context.Context, info *event.BridgedSticker) (*types.StickerPackItem, error) {
+ if info == nil || info.Network != StickerSourceID || !strings.HasPrefix(info.PackURL, StickerPackURLPrefix) || info.ID == "" {
+ return nil, nil
+ }
+ fileHash, err := base64.StdEncoding.DecodeString(info.ID)
+ if err != nil {
+ return nil, nil
+ }
+ return mc.GetCachedSticker(ctx, getClient(ctx), strings.TrimPrefix(info.PackURL, StickerPackURLPrefix), fileHash)
+}
+
func (mc *MessageConverter) reuploadFileToWhatsApp(
ctx context.Context, content *event.MessageEventContent,
) (*whatsmeow.UploadResponse, []byte, string, error) {
@@ -490,7 +503,25 @@ func (mc *MessageConverter) reuploadFileToWhatsApp(
if content.FileName != "" {
fileName = content.FileName
}
- data, err := mc.Bridge.Bot.DownloadMedia(ctx, content.URL, content.File)
+ var data []byte
+ var err error
+ var sticker *types.StickerPackItem
+ if sticker, err = mc.getOriginalBridgedSticker(ctx, content.Info.BridgedSticker); err != nil {
+ zerolog.Ctx(ctx).Warn().Err(err).
+ Msg("Failed to get original bridged sticker, falling back to downloading from URL")
+ data, err = mc.Bridge.Bot.DownloadMedia(ctx, content.URL, content.File)
+ } else if sticker != nil {
+ if sticker.MimeType == "application/was" {
+ data, err = getClient(ctx).Download(ctx, sticker)
+ mime = sticker.MimeType
+ } else {
+ data, err = mc.Bridge.Bot.DownloadMedia(ctx, content.URL, content.File)
+ }
+ content.Info.Width = sticker.Width
+ content.Info.Height = sticker.Height
+ } else {
+ data, err = mc.Bridge.Bot.DownloadMedia(ctx, content.URL, content.File)
+ }
if err != nil {
return nil, nil, "", fmt.Errorf("%w: %w", bridgev2.ErrMediaDownloadFailed, err)
}
@@ -508,7 +539,14 @@ func (mc *MessageConverter) reuploadFileToWhatsApp(
case event.MessageType(event.EventSticker.Type):
isSticker = true
mediaType = whatsmeow.MediaImage
- if mime != "image/webp" || content.Info.Width != content.Info.Height {
+ if mime == "video/lottie+json" {
+ // This likely won't work
+ data, err = PackAnimatedSticker(data)
+ if err != nil {
+ return nil, nil, mime, fmt.Errorf("%w (packing animated sticker): %w", bridgev2.ErrMediaConvertFailed, err)
+ }
+ mime = "application/was"
+ } else if (mime != "image/webp" || content.Info.Width != content.Info.Height) && mime != "application/was" {
var size int
data, size, err = mc.convertToWebP(data)
if err != nil {
diff --git a/pkg/msgconv/from-whatsapp.go b/pkg/msgconv/from-whatsapp.go
index 2117535..f0e4560 100644
--- a/pkg/msgconv/from-whatsapp.go
+++ b/pkg/msgconv/from-whatsapp.go
@@ -215,12 +215,10 @@ func (mc *MessageConverter) ToMatrix(
part, contextInfo = mc.convertPlaceholderMessage(ctx, waMsg)
case waMsg.GroupInviteMessage != nil:
part, contextInfo = mc.convertGroupInviteMessage(ctx, info, waMsg.GroupInviteMessage)
+ case waMsg.MessageHistoryNotice != nil:
+ part, contextInfo = mc.convertMessageHistoryNotice(ctx, info, waMsg.MessageHistoryNotice)
case waMsg.ProtocolMessage != nil && waMsg.ProtocolMessage.GetType() == waE2E.ProtocolMessage_EPHEMERAL_SETTING:
part, contextInfo = mc.convertEphemeralSettingMessage(ctx, waMsg.ProtocolMessage, info.Timestamp, isBackfill)
- case waMsg.MessageHistoryBundle != nil:
- part, contextInfo = mc.convertMessageHistoryShare(ctx, info, waMsg.MessageHistoryBundle.GetMessageHistoryMetadata(), waMsg.MessageHistoryBundle.GetContextInfo())
- case waMsg.MessageHistoryNotice != nil:
- part, contextInfo = mc.convertMessageHistoryShare(ctx, info, waMsg.MessageHistoryNotice.GetMessageHistoryMetadata(), waMsg.MessageHistoryNotice.GetContextInfo())
case waMsg.EncCommentMessage != nil:
part = failedCommentPart
default:
diff --git a/pkg/msgconv/msgconv.go b/pkg/msgconv/msgconv.go
index e4109c8..185ee0f 100644
--- a/pkg/msgconv/msgconv.go
+++ b/pkg/msgconv/msgconv.go
@@ -17,6 +17,9 @@
package msgconv
import (
+ "sync"
+
+ "go.mau.fi/whatsmeow/types"
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/format"
@@ -43,12 +46,16 @@ type MessageConverter struct {
DisableViewOnce bool
DirectMedia bool
OldMediaSuffix string
+
+ stickerPackCache map[string]*types.StickerPack
+ stickerPackCacheLock sync.Mutex
}
func New(br *bridgev2.Bridge) *MessageConverter {
mc := &MessageConverter{
- Bridge: br,
- MaxFileSize: 50 * 1024 * 1024,
+ Bridge: br,
+ MaxFileSize: 50 * 1024 * 1024,
+ stickerPackCache: make(map[string]*types.StickerPack),
}
mc.HTMLParser = &format.HTMLParser{
PillConverter: mc.convertPill,
diff --git a/pkg/msgconv/wa-location.go b/pkg/msgconv/wa-location.go
index 17efecd..4a1e043 100644
--- a/pkg/msgconv/wa-location.go
+++ b/pkg/msgconv/wa-location.go
@@ -20,6 +20,7 @@ import (
"bytes"
"context"
"fmt"
+ "html"
"image"
"math"
"net/http"
@@ -51,7 +52,7 @@ func (mc *MessageConverter) convertLocationMessage(ctx context.Context, msg *waE
MsgType: event.MsgLocation,
Body: fmt.Sprintf("Location: %s\n%s\n%s", name, msg.GetAddress(), url),
Format: event.FormatHTML,
- FormattedBody: fmt.Sprintf("Location: %s
%s", url, name, msg.GetAddress()),
+ FormattedBody: fmt.Sprintf(`Location: %s
%s`, html.EscapeString(url), html.EscapeString(name), html.EscapeString(msg.GetAddress())),
GeoURI: fmt.Sprintf("geo:%.5f,%.5f", msg.GetDegreesLatitude(), msg.GetDegreesLongitude()),
}
diff --git a/pkg/msgconv/wa-media.go b/pkg/msgconv/wa-media.go
index 9a1ceb3..9964800 100644
--- a/pkg/msgconv/wa-media.go
+++ b/pkg/msgconv/wa-media.go
@@ -17,8 +17,6 @@
package msgconv
import (
- "archive/zip"
- "bytes"
"context"
"encoding/json"
"errors"
@@ -26,21 +24,19 @@ import (
"io"
"net/http"
"os"
- "path/filepath"
- "strconv"
"strings"
"github.com/rs/zerolog"
+ "go.mau.fi/util/exfmt"
"go.mau.fi/util/exmime"
"go.mau.fi/util/exslices"
- "go.mau.fi/util/lottie"
- "go.mau.fi/util/random"
"go.mau.fi/whatsmeow"
"go.mau.fi/whatsmeow/proto/waE2E"
"go.mau.fi/whatsmeow/types"
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/database"
"maunium.net/go/mautrix/event"
+ "maunium.net/go/mautrix/id"
"go.mau.fi/mautrix-whatsapp/pkg/waid"
)
@@ -87,15 +83,15 @@ func (mc *MessageConverter) convertMediaMessage(
MimeType: msg.GetMimetype(),
}
if mc.DirectMedia {
- preparedMedia.FillFileName()
if preparedMedia.Info.MimeType == "application/was" {
preparedMedia.Info.MimeType = "video/lottie+json"
preparedMedia.FileName = "sticker.json"
}
+ preparedMedia.FillFileName()
var err error
portal := getPortal(ctx)
idOverride := getEditTargetID(ctx)
- preparedMedia.URL, err = portal.Bridge.Matrix.GenerateContentURI(ctx, waid.MakeMediaID(messageInfo, idOverride, portal.Receiver))
+ preparedMedia.URL, err = portal.Bridge.Matrix.GenerateContentURI(ctx, waid.MakeMediaID(messageInfo, idOverride, portal.Receiver, getMediaIDVersion(msg)))
if err != nil {
panic(fmt.Errorf("failed to generate content URI: %w", err))
}
@@ -124,13 +120,20 @@ func (mc *MessageConverter) convertMediaMessage(
return
}
+func getMediaIDVersion(msg MediaMessage) []byte {
+ if encSHA256 := msg.GetFileEncSHA256(); len(encSHA256) > 0 {
+ return encSHA256
+ }
+ return msg.GetFileSHA256()
+}
+
func (mc *MessageConverter) convertAlbumMessage(ctx context.Context, msg *waE2E.AlbumMessage) (*bridgev2.ConvertedMessagePart, *waE2E.ContextInfo) {
parts := make([]string, 0, 2)
if msg.GetExpectedImageCount() > 0 {
- parts = append(parts, fmt.Sprintf("%d images", msg.GetExpectedImageCount()))
+ parts = append(parts, exfmt.Pluralizable("image")(int(msg.GetExpectedImageCount())))
}
if msg.GetExpectedVideoCount() > 0 {
- parts = append(parts, fmt.Sprintf("%d videos", msg.GetExpectedVideoCount()))
+ parts = append(parts, exfmt.Pluralizable("video")(int(msg.GetExpectedVideoCount())))
}
var partDesc string
if len(parts) > 0 {
@@ -198,7 +201,9 @@ type PreparedMedia struct {
}
func (pm *PreparedMedia) FillFileName() *PreparedMedia {
- if pm.FileName == "" {
+ if pm.Type == event.EventSticker {
+ pm.FileName = ""
+ } else if pm.FileName == "" {
pm.FileName = strings.TrimPrefix(string(pm.MsgType), "m.") + exmime.ExtensionFromMimetype(pm.Info.MimeType)
}
return pm
@@ -239,6 +244,19 @@ type MediaMessageWithDuration interface {
const WhatsAppStickerSize = 190
+func fixStickerDimensions(info *event.FileInfo) {
+ if info.Width == info.Height {
+ info.Width = WhatsAppStickerSize
+ info.Height = WhatsAppStickerSize
+ } else if info.Width > info.Height {
+ info.Height /= info.Width / WhatsAppStickerSize
+ info.Width = WhatsAppStickerSize
+ } else {
+ info.Width /= info.Height / WhatsAppStickerSize
+ info.Height = WhatsAppStickerSize
+ }
+}
+
func prepareMediaMessage(rawMsg MediaMessage) *PreparedMedia {
extraInfo := map[string]any{}
data := &PreparedMedia{
@@ -287,19 +305,7 @@ func prepareMediaMessage(rawMsg MediaMessage) *PreparedMedia {
case *waE2E.StickerMessage:
data.Type = event.EventSticker
data.FileName = "sticker" + exmime.ExtensionFromMimetype(msg.GetMimetype())
- if msg.GetMimetype() == "application/was" && data.FileName == "sticker" {
- data.FileName = "sticker.json"
- }
- if data.Info.Width == data.Info.Height {
- data.Info.Width = WhatsAppStickerSize
- data.Info.Height = WhatsAppStickerSize
- } else if data.Info.Width > data.Info.Height {
- data.Info.Height /= data.Info.Width / WhatsAppStickerSize
- data.Info.Width = WhatsAppStickerSize
- } else {
- data.Info.Width /= data.Info.Height / WhatsAppStickerSize
- data.Info.Height = WhatsAppStickerSize
- }
+ fixStickerDimensions(data.Info)
case *waE2E.VideoMessage:
data.MsgType = event.MsgVideo
pairedMediaType := msg.GetContextInfo().GetPairedMediaType()
@@ -359,14 +365,17 @@ func (mc *MessageConverter) reuploadWhatsAppAttachment(
) error {
client := getClient(ctx)
intent := getIntent(ctx)
- portal := getPortal(ctx)
+ var roomID id.RoomID
+ if portal := getPortal(ctx); portal != nil {
+ roomID = portal.MXID
+ }
var thumbnailData []byte
var thumbnailInfo *event.FileInfo
if part.Info.Size > uploadFileThreshold {
var err error
- part.URL, part.File, err = intent.UploadMediaStream(ctx, portal.MXID, -1, true, func(file io.Writer) (*bridgev2.FileStreamResult, error) {
+ part.URL, part.File, err = intent.UploadMediaStream(ctx, roomID, -1, true, func(file io.Writer) (*bridgev2.FileStreamResult, error) {
err := client.DownloadToFile(ctx, message, file.(*os.File))
- if errors.Is(err, whatsmeow.ErrFileLengthMismatch) || errors.Is(err, whatsmeow.ErrInvalidMediaSHA256) {
+ if errors.Is(err, whatsmeow.ErrInvalidMediaSHA256) {
zerolog.Ctx(ctx).Warn().Err(err).Msg("Mismatching media checksums in message. Ignoring because WhatsApp seems to ignore them too")
} else if err != nil {
return nil, fmt.Errorf("%w: %w", bridgev2.ErrMediaDownloadFailed, err)
@@ -387,7 +396,7 @@ func (mc *MessageConverter) reuploadWhatsAppAttachment(
}
} else {
data, err := client.Download(ctx, message)
- if errors.Is(err, whatsmeow.ErrFileLengthMismatch) || errors.Is(err, whatsmeow.ErrInvalidMediaSHA256) {
+ if errors.Is(err, whatsmeow.ErrInvalidMediaSHA256) {
zerolog.Ctx(ctx).Warn().Err(err).Msg("Mismatching media checksums in message. Ignoring because WhatsApp seems to ignore them too")
} else if err != nil {
return fmt.Errorf("%w: %w", bridgev2.ErrMediaDownloadFailed, err)
@@ -397,12 +406,14 @@ func (mc *MessageConverter) reuploadWhatsAppAttachment(
if err != nil {
return err
}
+ } else if part.Type == event.EventSticker && part.Info.MimeType == "image/webp" {
+ mc.fillWebPStickerInfo(ctx, part, data)
}
if part.Info.MimeType == "" {
part.Info.MimeType = http.DetectContentType(data)
}
part.FillFileName()
- part.URL, part.File, err = intent.UploadMedia(ctx, portal.MXID, data, part.FileName, part.Info.MimeType)
+ part.URL, part.File, err = intent.UploadMedia(ctx, roomID, data, part.FileName, part.Info.MimeType)
if err != nil {
return fmt.Errorf("%w: %w", bridgev2.ErrMediaReuploadFailed, err)
}
@@ -411,7 +422,7 @@ func (mc *MessageConverter) reuploadWhatsAppAttachment(
var err error
part.Info.ThumbnailURL, part.Info.ThumbnailFile, err = intent.UploadMedia(
ctx,
- portal.MXID,
+ roomID,
thumbnailData,
"thumbnail"+exmime.ExtensionFromMimetype(thumbnailInfo.MimeType),
thumbnailInfo.MimeType,
@@ -425,68 +436,6 @@ func (mc *MessageConverter) reuploadWhatsAppAttachment(
return nil
}
-func (mc *MessageConverter) extractAnimatedSticker(fileInfo *PreparedMedia, data []byte) ([]byte, error) {
- data, err := ExtractAnimatedSticker(data)
- if err != nil {
- return nil, err
- }
- fileInfo.Info.MimeType = "video/lottie+json"
- fileInfo.FileName = "sticker.json"
- return data, nil
-}
-
-func (mc *MessageConverter) convertAnimatedSticker(ctx context.Context, fileInfo *PreparedMedia, data []byte) ([]byte, []byte, *event.FileInfo, error) {
- data, err := mc.extractAnimatedSticker(fileInfo, data)
- if err != nil {
- return nil, nil, nil, err
- }
- c := mc.AnimatedStickerConfig
- if c.Target == "disable" {
- return data, nil, nil, nil
- } else if !lottie.Supported() {
- zerolog.Ctx(ctx).Warn().Msg("Animated sticker conversion is enabled, but lottieconverter is not installed")
- return data, nil, nil, nil
- }
- input := bytes.NewReader(data)
- fileInfo.Info.MimeType = "image/" + c.Target
- fileInfo.FileName = "sticker." + c.Target
- switch c.Target {
- case "png":
- var output bytes.Buffer
- err = lottie.Convert(ctx, input, "", &output, c.Target, c.Args.Width, c.Args.Height, "1")
- return output.Bytes(), nil, nil, err
- case "gif":
- var output bytes.Buffer
- err = lottie.Convert(ctx, input, "", &output, c.Target, c.Args.Width, c.Args.Height, strconv.Itoa(c.Args.FPS))
- return output.Bytes(), nil, nil, err
- case "webm", "webp":
- tmpFile := filepath.Join(os.TempDir(), fmt.Sprintf("mautrix-whatsapp-lottieconverter-%s.%s", random.String(10), c.Target))
- defer func() {
- _ = os.Remove(tmpFile)
- }()
- thumbnailData, err := lottie.FFmpegConvert(ctx, input, tmpFile, c.Args.Width, c.Args.Height, c.Args.FPS)
- if err != nil {
- return nil, nil, nil, err
- }
- data, err = os.ReadFile(tmpFile)
- if err != nil {
- return nil, nil, nil, fmt.Errorf("failed to read converted file: %w", err)
- }
- var thumbnailInfo *event.FileInfo
- if thumbnailData != nil {
- thumbnailInfo = &event.FileInfo{
- MimeType: "image/png",
- Width: c.Args.Width,
- Height: c.Args.Height,
- Size: len(thumbnailData),
- }
- }
- return data, thumbnailData, thumbnailInfo, nil
- default:
- return nil, nil, nil, fmt.Errorf("unsupported target format %s", c.Target)
- }
-}
-
func (mc *MessageConverter) makeMediaFailure(ctx context.Context, mediaInfo *PreparedMedia, keys *FailedMediaKeys, err error) *bridgev2.ConvertedMessagePart {
logLevel := zerolog.ErrorLevel
var extra map[string]any
@@ -531,28 +480,3 @@ func (mc *MessageConverter) makeMediaFailure(ctx context.Context, mediaInfo *Pre
}
return part
}
-
-func ExtractAnimatedSticker(data []byte) ([]byte, error) {
- zipReader, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
- if err != nil {
- return nil, fmt.Errorf("failed to read sticker zip: %w", err)
- }
- animationFile, err := zipReader.Open("animation/animation.json")
- if err != nil {
- return nil, fmt.Errorf("failed to open animation.json: %w", err)
- }
- animationFileInfo, err := animationFile.Stat()
- if err != nil {
- _ = animationFile.Close()
- return nil, fmt.Errorf("failed to stat animation.json: %w", err)
- } else if animationFileInfo.Size() > uploadFileThreshold {
- _ = animationFile.Close()
- return nil, fmt.Errorf("animation.json is too large (%.2f MiB)", float64(animationFileInfo.Size())/1024/1024)
- }
- data, err = io.ReadAll(animationFile)
- _ = animationFile.Close()
- if err != nil {
- return nil, fmt.Errorf("failed to read animation.json: %w", err)
- }
- return data, nil
-}
diff --git a/pkg/msgconv/wa-misc.go b/pkg/msgconv/wa-misc.go
index 22c014c..fa495e0 100644
--- a/pkg/msgconv/wa-misc.go
+++ b/pkg/msgconv/wa-misc.go
@@ -20,12 +20,14 @@ import (
"context"
"encoding/base64"
"fmt"
+ "html"
"html/template"
"strings"
"time"
"github.com/rs/zerolog"
"go.mau.fi/util/exerrors"
+ "go.mau.fi/util/exfmt"
"go.mau.fi/util/ptr"
"go.mau.fi/whatsmeow/proto/waAICommonDeprecated"
"go.mau.fi/whatsmeow/proto/waE2E"
@@ -73,72 +75,6 @@ func (mc *MessageConverter) convertPlaceholderMessage(ctx context.Context, rawMs
}
}
-func (mc *MessageConverter) getHistoryReceiverName(ctx context.Context, receiver string) string {
- jid, err := types.ParseJID(receiver)
- if err != nil {
- zerolog.Ctx(ctx).Err(err).Str("receiver_jid", receiver).Msg("Failed to parse message history receiver JID")
- return receiver
- }
- _, displayname, err := mc.getBasicUserInfo(ctx, jid)
- if err != nil {
- zerolog.Ctx(ctx).Err(err).Stringer("receiver_jid", jid).Msg("Failed to resolve message history receiver")
- if jid.User != "" {
- return jid.User
- }
- return receiver
- }
- return displayname
-}
-
-func messageHistoryStartTime(metadata *waE2E.MessageHistoryMetadata, fallback time.Time) time.Time {
- if metadata == nil {
- return fallback
- }
- if ts := metadata.GetOldestMessageTimestamp(); ts > 0 {
- return time.Unix(ts, 0).Local()
- }
- return fallback
-}
-
-func (mc *MessageConverter) convertMessageHistoryShare(ctx context.Context, info *types.MessageInfo, metadata *waE2E.MessageHistoryMetadata, contextInfo *waE2E.ContextInfo) (*bridgev2.ConvertedMessagePart, *waE2E.ContextInfo) {
- names := make([]string, 0, len(metadata.GetHistoryReceivers()))
- for _, receiver := range metadata.GetHistoryReceivers() {
- if name := mc.getHistoryReceiverName(ctx, receiver); name != "" {
- names = append(names, name)
- }
- }
-
- receivers := strings.Join(names, ", ")
- var fallback time.Time
- if info != nil {
- fallback = info.Timestamp
- }
- startAt := messageHistoryStartTime(metadata, fallback)
- body := "Message history shared."
- if !startAt.IsZero() {
- startTime := startAt.Format("Jan 2, 2006 at 3:04 PM")
- body = fmt.Sprintf("Message history shared starting on %s.", startTime)
- switch {
- case info != nil && info.IsFromMe && receivers != "":
- body = fmt.Sprintf("You sent %s message history that starts on %s.", receivers, startTime)
- case receivers != "":
- body = fmt.Sprintf("Sent %s message history that starts on %s.", receivers, startTime)
- }
- } else if info != nil && info.IsFromMe && receivers != "" {
- body = fmt.Sprintf("You sent %s message history.", receivers)
- } else if receivers != "" {
- body = fmt.Sprintf("Sent %s message history.", receivers)
- }
-
- return &bridgev2.ConvertedMessagePart{
- Type: event.EventMessage,
- Content: &event.MessageEventContent{
- MsgType: event.MsgNotice,
- Body: body,
- },
- }, contextInfo
-}
-
const inviteMsg = `%s
This invitation to join "%s" expires at %s. Reply to this message with %s accept to accept the invite.`
const inviteMsgBroken = `%s
This invitation to join "%s" expires at %s. However, the invite message is broken or unsupported and cannot be accepted.`
const GroupInviteMetaField = "fi.mau.whatsapp.invite"
@@ -166,7 +102,7 @@ func (mc *MessageConverter) convertGroupInviteMessage(ctx context.Context, info
}
}
- htmlMessage := fmt.Sprintf(template, event.TextToHTML(msg.GetCaption()), msg.GetGroupName(), expiry, mc.Bridge.Config.CommandPrefix)
+ htmlMessage := fmt.Sprintf(template, event.TextToHTML(msg.GetCaption()), html.EscapeString(msg.GetGroupName()), expiry, mc.Bridge.Config.CommandPrefix)
content := &event.MessageEventContent{
MsgType: event.MsgText,
Body: format.HTMLToText(htmlMessage),
@@ -183,6 +119,92 @@ func (mc *MessageConverter) convertGroupInviteMessage(ctx context.Context, info
}, msg.GetContextInfo()
}
+func (mc *MessageConverter) formatMessageHistoryNoticeJID(ctx context.Context, jid types.JID) string {
+ _, displayName, err := mc.getBasicUserInfo(ctx, jid)
+ if err != nil {
+ zerolog.Ctx(ctx).Err(err).Stringer("jid", jid).Msg("Failed to get user info for message history notice")
+ } else if displayName != "" {
+ return displayName
+ }
+ switch jid.Server {
+ case types.DefaultUserServer:
+ return "+" + jid.User
+ default:
+ return "Unknown user " + jid.String()
+ }
+}
+
+const maxMessageHistoryNoticeReceivers = 5
+
+var others = exfmt.Pluralizable("other")
+
+func (mc *MessageConverter) formatMessageHistoryNoticeReceivers(ctx context.Context, receivers []string) string {
+ receiverLimit := min(len(receivers), maxMessageHistoryNoticeReceivers)
+ receiverNames := make([]string, 0, receiverLimit)
+ for _, receiver := range receivers[:receiverLimit] {
+ jid, err := types.ParseJID(receiver)
+ if err != nil {
+ zerolog.Ctx(ctx).Err(err).Str("receiver", receiver).Msg("Failed to parse message history receiver JID")
+ receiverNames = append(receiverNames, receiver)
+ } else {
+ receiverNames = append(receiverNames, mc.formatMessageHistoryNoticeJID(ctx, jid))
+ }
+ }
+ receiverText := strings.Join(receiverNames, ", ")
+ if len(receivers) > receiverLimit {
+ receiverText = fmt.Sprintf("%s + %s", receiverText, others(len(receivers)-receiverLimit))
+ }
+ return receiverText
+}
+
+func (mc *MessageConverter) messageHistoryNoticeLocation(ctx context.Context) *time.Location {
+ portal := getPortal(ctx)
+ loginID := portal.Receiver
+ if loginID == "" {
+ loginID = waid.MakeUserLoginID(getClient(ctx).Store.GetJID().ToNonAD())
+ }
+ if login := mc.Bridge.GetCachedUserLoginByID(loginID); login != nil {
+ meta, _ := login.Metadata.(*waid.UserLoginMetadata)
+ loc, err := meta.LoadTimezone()
+ if err != nil {
+ zerolog.Ctx(ctx).Err(err).Str("timezone", meta.Timezone).Msg("Failed to load user timezone for message history notice")
+ } else if loc != nil {
+ return loc
+ }
+ }
+ return time.Local
+}
+
+func (mc *MessageConverter) convertMessageHistoryNotice(ctx context.Context, info *types.MessageInfo, msg *waE2E.MessageHistoryNotice) (*bridgev2.ConvertedMessagePart, *waE2E.ContextInfo) {
+ metadata := msg.GetMessageHistoryMetadata()
+
+ sender := mc.formatMessageHistoryNoticeJID(ctx, info.Sender)
+ body := fmt.Sprintf("%s sent message history", sender)
+ if receiverText := mc.formatMessageHistoryNoticeReceivers(ctx, metadata.GetHistoryReceivers()); receiverText != "" {
+ body = fmt.Sprintf("%s to %s", body, receiverText)
+ }
+ if count := metadata.GetMessageCount(); count > 0 {
+ messageWord := "messages"
+ if count == 1 {
+ messageWord = "message"
+ }
+ body = fmt.Sprintf("%s (%d %s)", body, count, messageWord)
+ }
+ if metadata != nil && metadata.OldestMessageTimestampInWindow != nil {
+ oldestTS := time.Unix(metadata.GetOldestMessageTimestampInWindow(), 0).In(mc.messageHistoryNoticeLocation(ctx))
+ body = fmt.Sprintf("%s, starting %s", body, oldestTS.Format("Jan 2, 2006 at 3:04 PM"))
+ }
+ body += "."
+
+ return &bridgev2.ConvertedMessagePart{
+ Type: event.EventMessage,
+ Content: &event.MessageEventContent{
+ MsgType: event.MsgNotice,
+ Body: body,
+ },
+ }, msg.GetContextInfo()
+}
+
func (mc *MessageConverter) convertEphemeralSettingMessage(ctx context.Context, msg *waE2E.ProtocolMessage, ts time.Time, isBackfill bool) (*bridgev2.ConvertedMessagePart, *waE2E.ContextInfo) {
portal := getPortal(ctx)
portalMeta := portal.Metadata.(*waid.PortalMetadata)
diff --git a/pkg/msgconv/wa-sticker.go b/pkg/msgconv/wa-sticker.go
new file mode 100644
index 0000000..b9797a6
--- /dev/null
+++ b/pkg/msgconv/wa-sticker.go
@@ -0,0 +1,455 @@
+// 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 .
+
+package msgconv
+
+import (
+ "archive/zip"
+ "bytes"
+ "context"
+ "encoding/base64"
+ "encoding/binary"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "io"
+ "net/url"
+ "os"
+ "path/filepath"
+ "strconv"
+ "strings"
+
+ "github.com/rs/zerolog"
+ "github.com/tidwall/gjson"
+ "go.mau.fi/util/exstrings"
+ "go.mau.fi/util/lottie"
+ "go.mau.fi/util/random"
+ "go.mau.fi/whatsmeow"
+ "go.mau.fi/whatsmeow/types"
+ "maunium.net/go/mautrix"
+ "maunium.net/go/mautrix/bridgev2"
+ "maunium.net/go/mautrix/bridgev2/database"
+ "maunium.net/go/mautrix/bridgev2/networkid"
+ "maunium.net/go/mautrix/event"
+
+ "go.mau.fi/mautrix-whatsapp/pkg/waid"
+)
+
+func (mc *MessageConverter) GetCachedStickerPack(ctx context.Context, client *whatsmeow.Client, packID string) (*types.StickerPack, error) {
+ mc.stickerPackCacheLock.Lock()
+ defer mc.stickerPackCacheLock.Unlock()
+ cached, ok := mc.stickerPackCache[packID]
+ if ok {
+ if cached == nil {
+ return nil, bridgev2.RespError(mautrix.MNotFound.WithMessage("sticker pack not found (cached)"))
+ }
+ return cached, nil
+ }
+
+ pack, err := client.FetchStickerPack(ctx, packID)
+ if errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith404) {
+ mc.stickerPackCache[packID] = nil
+ return nil, bridgev2.WrapRespErr(err, mautrix.MNotFound)
+ } else if err != nil {
+ return nil, err
+ }
+ mc.stickerPackCache[packID] = pack
+ if packID != pack.StickerPackID {
+ mc.stickerPackCache[pack.StickerPackID] = pack
+ }
+ return pack, nil
+}
+
+func (mc *MessageConverter) GetCachedSticker(ctx context.Context, client *whatsmeow.Client, packID string, hash []byte) (*types.StickerPackItem, error) {
+ pack, err := mc.GetCachedStickerPack(ctx, client, packID)
+ if err != nil {
+ return nil, err
+ }
+ for _, sticker := range pack.Stickers {
+ if bytes.Equal(sticker.FileHash, hash) {
+ return sticker, nil
+ }
+ }
+ return nil, nil
+}
+
+func (mc *MessageConverter) DownloadImagePack(ctx context.Context, userLoginID networkid.UserLoginID, client *whatsmeow.Client, inputURL string) (*bridgev2.ImportedImagePack, error) {
+ parsedURL, err := url.Parse(inputURL)
+ if err != nil {
+ return nil, bridgev2.WrapRespErr(err, mautrix.MNotFound)
+ } else if parsedURL.Host != "api.whatsapp.com" && parsedURL.Host != "wa.me" {
+ return nil, bridgev2.WrapRespErr(fmt.Errorf("invalid host %q", parsedURL.Host), mautrix.MNotFound)
+ } else if !strings.HasPrefix(parsedURL.Path, "/stickerpack/") {
+ return nil, bridgev2.WrapRespErr(fmt.Errorf("invalid path %q", parsedURL.Path), mautrix.MNotFound)
+ }
+ packName := strings.Split(strings.TrimPrefix(parsedURL.Path, "/stickerpack/"), "/")[0]
+ if packName == "" {
+ return nil, bridgev2.WrapRespErr(fmt.Errorf("empty pack name"), mautrix.MNotFound)
+ }
+ pack, err := mc.GetCachedStickerPack(ctx, client, packName)
+ if err != nil {
+ return nil, err
+ }
+ canonicalURL := "https://wa.me/stickerpack/" + pack.StickerPackID
+ topLevelExtra := map[string]any{
+ "fi.mau.whatsapp.stickerpack": map[string]any{
+ "id": pack.StickerPackID,
+ "name": pack.Name,
+ "description": pack.Description,
+ "publisher": pack.Publisher,
+ "animated": pack.Animated > 0,
+ "lottie": pack.Lottie > 0,
+ },
+ }
+ content := &event.ImagePackEventContent{
+ Images: make(map[string]*event.ImagePackImage, len(pack.Stickers)),
+ Metadata: event.ImagePackMetadata{
+ DisplayName: pack.Name,
+ AvatarURL: "",
+ Usage: []event.ImagePackUsage{event.ImagePackUsageSticker},
+ Attribution: fmt.Sprintf("By %s on WhatsApp %s", pack.Publisher, canonicalURL),
+ BridgedPack: &event.BridgedStickerPack{
+ Network: StickerSourceID,
+ URL: canonicalURL,
+ },
+ },
+ }
+ ctx = context.WithValue(ctx, contextKeyClient, client)
+ ctx = context.WithValue(ctx, contextKeyIntent, mc.Bridge.Bot)
+ ctx = context.WithValue(ctx, contextKeyPortal, (*bridgev2.Portal)(nil))
+ for i, sticker := range pack.Stickers {
+ shortcode := sticker.PreviewWebpID
+ if shortcode == "" {
+ shortcode = fmt.Sprintf("%s_img%d", pack.StickerPackID, i+1)
+ }
+ body := sticker.AccessibilityText
+ var emoji string
+ if len(sticker.Emojis) > 0 {
+ emoji = sticker.Emojis[0]
+ if body == "" {
+ body = strings.Join(sticker.Emojis, " ")
+ }
+ }
+ part := &PreparedMedia{
+ Type: event.EventSticker,
+ MessageEventContent: &event.MessageEventContent{
+ Body: body,
+ Info: &event.FileInfo{
+ MimeType: sticker.MimeType,
+ Width: sticker.Width,
+ Height: sticker.Height,
+ Size: int(sticker.FileSize),
+ BridgedSticker: &event.BridgedSticker{
+ Network: StickerSourceID,
+ ID: base64.StdEncoding.EncodeToString(sticker.FileHash),
+ Emoji: emoji,
+ PackURL: canonicalURL,
+ },
+ },
+ },
+ TypeDescription: "sticker",
+ }
+ dbKey := database.Key(fmt.Sprintf("stickercache:%x", part.Info.BridgedSticker.ID))
+ fixStickerDimensions(part.Info)
+ var packed *event.ImagePackImage
+ if mc.DirectMedia {
+ dbKey = ""
+ if part.Info.MimeType == "application/was" {
+ part.Info.MimeType = "video/lottie+json"
+ }
+ part.URL, err = mc.Bridge.Matrix.GenerateContentURI(ctx, waid.MakeStickerPackMediaID(pack.StickerPackID, sticker.FileHash, userLoginID))
+ if err != nil {
+ panic(fmt.Errorf("failed to generate content URI: %w", err))
+ }
+ } else if cached := mc.Bridge.DB.KV.Get(ctx, dbKey); cached != "" {
+ err = json.Unmarshal([]byte(cached), &packed)
+ if err != nil {
+ return nil, fmt.Errorf("failed to unmarshal cached sticker data: %w", err)
+ }
+ } else {
+ err = mc.reuploadWhatsAppAttachment(ctx, sticker, part)
+ if err != nil {
+ return nil, fmt.Errorf("failed to reupload sticker %q: %w", sticker.GetDirectPath(), err)
+ }
+ }
+ if packed == nil {
+ packed = &event.ImagePackImage{
+ URL: part.URL,
+ Body: part.Body,
+ Info: part.Info,
+ }
+ if dbKey != "" {
+ data, _ := json.Marshal(packed)
+ if data != nil {
+ mc.Bridge.DB.KV.Set(ctx, dbKey, string(data))
+ }
+ }
+ }
+ content.Images[shortcode] = packed
+ }
+
+ return &bridgev2.ImportedImagePack{
+ Content: content,
+ Extra: topLevelExtra,
+ Shortcode: pack.StickerPackID,
+ }, nil
+}
+
+type StickerMetadata struct {
+ StickerPackID string `json:"sticker-pack-id"`
+ AccessibilityText string `json:"accessibility-text"`
+ Emojis []string `json:"emojis"`
+ IsFirstPartySticker int `json:"is-first-party-sticker"`
+}
+
+func (sm *StickerMetadata) ToMatrix(content *event.MessageEventContent) {
+ if sm == nil {
+ return
+ }
+ if sm.StickerPackID != "" && content.Info.BridgedSticker == nil {
+ content.Info.BridgedSticker = &event.BridgedSticker{
+ Network: StickerSourceID,
+ PackURL: StickerPackURLPrefix + sm.StickerPackID,
+ }
+ if len(sm.Emojis) > 0 {
+ content.Info.BridgedSticker.Emoji = sm.Emojis[0]
+ }
+ }
+ if sm.AccessibilityText != "" {
+ content.Body = sm.AccessibilityText
+ } else if len(sm.Emojis) > 0 {
+ content.Body = strings.Join(sm.Emojis, " ")
+ }
+}
+
+const StickerSourceID = "whatsapp"
+const StickerPackURLPrefix = "https://wa.me/stickerpack/"
+
+func PackAnimatedSticker(data []byte) ([]byte, error) {
+ var buf bytes.Buffer
+ zipWriter := zip.NewWriter(&buf)
+ f, err := zipWriter.Create("animation/animation.json")
+ if err != nil {
+ return nil, fmt.Errorf("failed to create zip entry: %w", err)
+ }
+ _, err = f.Write(data)
+ if err != nil {
+ return nil, fmt.Errorf("failed to write zip entry: %w", err)
+ }
+ err = zipWriter.Close()
+ if err != nil {
+ return nil, fmt.Errorf("failed to close zip writer: %w", err)
+ }
+ return buf.Bytes(), nil
+}
+
+func ExtractAnimatedSticker(data []byte) ([]byte, *StickerMetadata, error) {
+ zipReader, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
+ if err != nil {
+ return nil, nil, fmt.Errorf("failed to read sticker zip: %w", err)
+ }
+ animationFile, err := zipReader.Open("animation/animation.json")
+ if err != nil {
+ return nil, nil, fmt.Errorf("failed to open animation.json: %w", err)
+ }
+ animationFileInfo, err := animationFile.Stat()
+ if err != nil {
+ _ = animationFile.Close()
+ return nil, nil, fmt.Errorf("failed to stat animation.json: %w", err)
+ } else if animationFileInfo.Size() > uploadFileThreshold {
+ _ = animationFile.Close()
+ return nil, nil, fmt.Errorf("animation.json is too large (%.2f MiB)", float64(animationFileInfo.Size())/1024/1024)
+ }
+ data, err = io.ReadAll(animationFile)
+ _ = animationFile.Close()
+ if err != nil {
+ return nil, nil, fmt.Errorf("failed to read animation.json: %w", err)
+ }
+ var meta StickerMetadata
+ metaFile, err := zipReader.Open("animation/animation.json.overridden_metadata")
+ if err == nil {
+ _ = json.NewDecoder(metaFile).Decode(&meta)
+ _ = metaFile.Close()
+ }
+ if meta.StickerPackID == "" {
+ res := gjson.GetBytes(data, "metadata.customProps")
+ if res.IsObject() {
+ _ = json.Unmarshal(exstrings.UnsafeBytes(res.Raw), &meta)
+ }
+ }
+ return data, &meta, nil
+}
+
+func (mc *MessageConverter) extractAnimatedSticker(fileInfo *PreparedMedia, data []byte) ([]byte, error) {
+ data, meta, err := ExtractAnimatedSticker(data)
+ if err != nil {
+ return nil, err
+ }
+ meta.ToMatrix(fileInfo.MessageEventContent)
+ fileInfo.Info.MimeType = "video/lottie+json"
+ fileInfo.FileName = "sticker.json"
+ return data, nil
+}
+
+func (mc *MessageConverter) convertAnimatedSticker(ctx context.Context, fileInfo *PreparedMedia, data []byte) ([]byte, []byte, *event.FileInfo, error) {
+ data, err := mc.extractAnimatedSticker(fileInfo, data)
+ if err != nil {
+ return nil, nil, nil, err
+ }
+ c := mc.AnimatedStickerConfig
+ if c.Target == "disable" {
+ return data, nil, nil, nil
+ } else if !lottie.Supported() {
+ zerolog.Ctx(ctx).Warn().Msg("Animated sticker conversion is enabled, but lottieconverter is not installed")
+ return data, nil, nil, nil
+ }
+ input := bytes.NewReader(data)
+ fileInfo.Info.MimeType = "image/" + c.Target
+ fileInfo.FileName = "sticker." + c.Target
+ switch c.Target {
+ case "png":
+ var output bytes.Buffer
+ err = lottie.Convert(ctx, input, "", &output, c.Target, c.Args.Width, c.Args.Height, "1")
+ return output.Bytes(), nil, nil, err
+ case "gif":
+ var output bytes.Buffer
+ err = lottie.Convert(ctx, input, "", &output, c.Target, c.Args.Width, c.Args.Height, strconv.Itoa(c.Args.FPS))
+ return output.Bytes(), nil, nil, err
+ case "webm", "webp":
+ tmpFile := filepath.Join(os.TempDir(), fmt.Sprintf("mautrix-whatsapp-lottieconverter-%s.%s", random.String(10), c.Target))
+ defer func() {
+ _ = os.Remove(tmpFile)
+ }()
+ thumbnailData, err := lottie.FFmpegConvert(ctx, input, tmpFile, c.Args.Width, c.Args.Height, c.Args.FPS)
+ if err != nil {
+ return nil, nil, nil, err
+ }
+ data, err = os.ReadFile(tmpFile)
+ if err != nil {
+ return nil, nil, nil, fmt.Errorf("failed to read converted file: %w", err)
+ }
+ var thumbnailInfo *event.FileInfo
+ if thumbnailData != nil {
+ thumbnailInfo = &event.FileInfo{
+ MimeType: "image/png",
+ Width: c.Args.Width,
+ Height: c.Args.Height,
+ Size: len(thumbnailData),
+ }
+ }
+ return data, thumbnailData, thumbnailInfo, nil
+ default:
+ return nil, nil, nil, fmt.Errorf("unsupported target format %s", c.Target)
+ }
+}
+
+func (mc *MessageConverter) fillWebPStickerInfo(ctx context.Context, fileInfo *PreparedMedia, data []byte) {
+ meta, err := extractWebPStickerMetadata(data)
+ if err != nil {
+ zerolog.Ctx(ctx).Debug().Err(err).Msg("Failed to extract webp sticker metadata")
+ return
+ }
+ meta.ToMatrix(fileInfo.MessageEventContent)
+}
+
+// stickerMetadataEXIFTag is the custom EXIF tag WhatsApp uses to embed
+// sticker pack metadata as a JSON object inside non-animated webp stickers.
+const stickerMetadataEXIFTag = 0x5741
+
+// extractWebPStickerMetadata parses the WhatsApp sticker pack metadata JSON
+// embedded in EXIF tag 0x5741 of a non-animated webp sticker.
+func extractWebPStickerMetadata(data []byte) (*StickerMetadata, error) {
+ exif, err := findWebPChunk(data, "EXIF")
+ if err != nil {
+ return nil, err
+ }
+ raw, err := findEXIFTagValue(exif, stickerMetadataEXIFTag)
+ if err != nil {
+ return nil, err
+ }
+ var meta StickerMetadata
+ err = json.Unmarshal(raw, &meta)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse sticker metadata JSON: %w", err)
+ }
+ return &meta, nil
+}
+
+func findWebPChunk(data []byte, chunkType string) ([]byte, error) {
+ if len(data) < 12 || string(data[0:4]) != "RIFF" || string(data[8:12]) != "WEBP" {
+ return nil, fmt.Errorf("not a webp file")
+ }
+ for pos := 12; pos+8 <= len(data); {
+ size := binary.LittleEndian.Uint32(data[pos+4 : pos+8])
+ start := pos + 8
+ end := start + int(size)
+ if end > len(data) {
+ return nil, fmt.Errorf("webp chunk %q extends past end of file", data[pos:pos+4])
+ }
+ if string(data[pos:pos+4]) == chunkType {
+ return data[start:end], nil
+ }
+ pos = end
+ if pos%2 != 0 {
+ pos++
+ }
+ }
+ return nil, fmt.Errorf("webp chunk %q not found", chunkType)
+}
+
+func findEXIFTagValue(exif []byte, tag uint16) ([]byte, error) {
+ if len(exif) < 8 {
+ return nil, fmt.Errorf("exif data too short")
+ }
+ var bo binary.ByteOrder
+ switch string(exif[0:2]) {
+ case "II":
+ bo = binary.LittleEndian
+ case "MM":
+ bo = binary.BigEndian
+ default:
+ return nil, fmt.Errorf("invalid TIFF byte order %q", exif[0:2])
+ }
+ if bo.Uint16(exif[2:4]) != 0x002A {
+ return nil, fmt.Errorf("invalid TIFF magic")
+ }
+ ifdOffset := int(bo.Uint32(exif[4:8]))
+ if ifdOffset < 0 || ifdOffset+2 > len(exif) {
+ return nil, fmt.Errorf("IFD offset out of range")
+ }
+ count := int(bo.Uint16(exif[ifdOffset : ifdOffset+2]))
+ entries := ifdOffset + 2
+ if entries+count*12 > len(exif) {
+ return nil, fmt.Errorf("IFD entries out of range")
+ }
+ for i := 0; i < count; i++ {
+ entry := exif[entries+i*12 : entries+(i+1)*12]
+ if bo.Uint16(entry[0:2]) != tag {
+ continue
+ }
+ // Tag 0x5741 stores JSON as type 7 (UNDEFINED), where size == count bytes.
+ size := int(bo.Uint32(entry[4:8]))
+ if size <= 4 {
+ return entry[8 : 8+size], nil
+ }
+ offset := int(bo.Uint32(entry[8:12]))
+ if offset+size > len(exif) {
+ return nil, fmt.Errorf("exif tag value out of range")
+ }
+ return exif[offset : offset+size], nil
+ }
+ return nil, fmt.Errorf("exif tag 0x%04x not found", tag)
+}
diff --git a/pkg/waid/dbmeta.go b/pkg/waid/dbmeta.go
index 2785105..1e54426 100644
--- a/pkg/waid/dbmeta.go
+++ b/pkg/waid/dbmeta.go
@@ -41,7 +41,8 @@ type UserLoginMetadata struct {
AppStateRecoveryAttempted map[appstate.WAPatchName]time.Time `json:"app_state_recovery_attempted,omitempty"`
- HistorySyncPortalsNeedCreating bool `json:"history_sync_portals_need_creating,omitempty"`
+ HistorySyncPortalsNeedCreating bool `json:"history_sync_portals_need_creating,omitempty"`
+ ReachoutTimelockUntil time.Time `json:"reachout_timelock_until,omitempty"`
MData json.RawMessage `json:"mdata,omitempty"`
}
@@ -61,6 +62,13 @@ func (m *UserLoginMetadata) GeneratePushKeys() {
}
}
+func (m *UserLoginMetadata) LoadTimezone() (*time.Location, error) {
+ if m == nil || m.Timezone == "" {
+ return nil, nil
+ }
+ return time.LoadLocation(m.Timezone)
+}
+
type MessageErrorType string
const (
diff --git a/pkg/waid/id.go b/pkg/waid/id.go
index 840e0f1..e522f5f 100644
--- a/pkg/waid/id.go
+++ b/pkg/waid/id.go
@@ -88,9 +88,10 @@ func MakeFakeMessageID(chat, sender types.JID, data string) networkid.MessageID
}
type ParsedMessageID struct {
- Chat types.JID
- Sender types.JID
- ID types.MessageID
+ Chat types.JID
+ Sender types.JID
+ ID types.MessageID
+ Version []byte
}
func (pmi *ParsedMessageID) String() networkid.MessageID {
diff --git a/pkg/waid/mediaid.go b/pkg/waid/mediaid.go
index 6a94de4..716e187 100644
--- a/pkg/waid/mediaid.go
+++ b/pkg/waid/mediaid.go
@@ -33,9 +33,10 @@ const (
mediaIDTypeMessage = 255
mediaIDTypeAvatar = 254
mediaIDTypeCommunityAvatar = 253
+ mediaIDTypeStickerPackItem = 252
)
-func MakeMediaID(messageInfo *types.MessageInfo, idOverride types.MessageID, receiver networkid.UserLoginID) networkid.MediaID {
+func MakeMediaID(messageInfo *types.MessageInfo, idOverride types.MessageID, receiver networkid.UserLoginID, version []byte) networkid.MediaID {
compactChat := compactJID(messageInfo.Chat.ToNonAD())
compactSender := compactJID(messageInfo.Sender.ToNonAD())
receiverID := compactJID(ParseUserLoginID(receiver, 0))
@@ -45,7 +46,7 @@ func MakeMediaID(messageInfo *types.MessageInfo, idOverride types.MessageID, rec
} else {
compactID = compactMsgID(messageInfo.ID)
}
- mediaID := make([]byte, 0, 5+len(compactChat)+len(compactSender)+len(receiverID)+len(compactID))
+ mediaID := make([]byte, 0, 6+len(compactChat)+len(compactSender)+len(receiverID)+len(compactID)+len(version))
mediaID = append(mediaID, mediaIDTypeMessage)
mediaID = append(mediaID, byte(len(compactChat)))
mediaID = append(mediaID, compactChat...)
@@ -55,6 +56,8 @@ func MakeMediaID(messageInfo *types.MessageInfo, idOverride types.MessageID, rec
mediaID = append(mediaID, receiverID...)
mediaID = append(mediaID, byte(len(compactID)))
mediaID = append(mediaID, compactID...)
+ mediaID = append(mediaID, byte(len(version)))
+ mediaID = append(mediaID, version...)
return mediaID
}
@@ -82,9 +85,28 @@ type AvatarMediaInfo struct {
Community bool
}
+func MakeStickerPackMediaID(packID string, fileHash []byte, receiver networkid.UserLoginID) networkid.MediaID {
+ receiverID := compactJID(ParseUserLoginID(receiver, 0))
+ mediaID := make([]byte, 0, 4+len(packID)+len(fileHash)+len(receiverID))
+ mediaID = append(mediaID, mediaIDTypeStickerPackItem)
+ mediaID = append(mediaID, byte(len(packID)))
+ mediaID = append(mediaID, packID...)
+ mediaID = append(mediaID, byte(len(fileHash)))
+ mediaID = append(mediaID, fileHash...)
+ mediaID = append(mediaID, byte(len(receiverID)))
+ mediaID = append(mediaID, receiverID...)
+ return mediaID
+}
+
+type StickerPackMediaInfo struct {
+ PackID string
+ FileHash []byte
+}
+
type ParsedMediaID struct {
Message *ParsedMessageID
Avatar *AvatarMediaInfo
+ Sticker *StickerPackMediaInfo
UserLogin networkid.UserLoginID
}
@@ -118,6 +140,12 @@ func ParseMediaID(mediaID networkid.MediaID) (*ParsedMediaID, error) {
Sender: senderJID,
ID: id,
}
+ if len(mediaID) > 0 {
+ parsed.Message.Version, err = readCompact(&mediaID, rawBytes)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse version: %w", err)
+ }
+ }
parsed.UserLogin = MakeUserLoginID(receiverID)
case mediaIDTypeAvatar, mediaIDTypeCommunityAvatar:
targetJID, err := readCompact(&mediaID, parseCompactJID)
@@ -138,6 +166,24 @@ func ParseMediaID(mediaID networkid.MediaID) (*ParsedMediaID, error) {
Community: mediaIDType == mediaIDTypeCommunityAvatar,
}
parsed.UserLogin = MakeUserLoginID(receiverID)
+ case mediaIDTypeStickerPackItem:
+ packID, err := readCompact(&mediaID, parseString)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse sticker pack ID: %w", err)
+ }
+ fileHash, err := readCompact(&mediaID, rawBytes)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse sticker file hash: %w", err)
+ }
+ receiverID, err := readCompact(&mediaID, parseCompactJID)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse receiver JID: %w", err)
+ }
+ parsed.Sticker = &StickerPackMediaInfo{
+ PackID: packID,
+ FileHash: fileHash,
+ }
+ parsed.UserLogin = MakeUserLoginID(receiverID)
default:
return nil, fmt.Errorf("unknown media ID type %d", mediaIDType)
}
@@ -246,6 +292,10 @@ func parseCompactJID(jid []byte) (types.JID, error) {
}
}
+func rawBytes(data []byte) ([]byte, error) {
+ return data, nil
+}
+
func readCompact[T any](data *networkid.MediaID, fn func(data []byte) (T, error)) (T, error) {
var defVal T
if len(*data) < 1 {