From f269a5b4ec2ad58e85a9044c863ad9a1c049084f Mon Sep 17 00:00:00 2001 From: Gerardo Rodriguez Date: Tue, 10 Nov 2026 06:10:00 +0000 Subject: [PATCH 1/7] handlematrix: send only the caption in media edits --- pkg/connector/handlematrix.go | 9 ++++++--- pkg/msgconv/from-matrix.go | 30 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/pkg/connector/handlematrix.go b/pkg/connector/handlematrix.go index 84198506..cc2e8436 100644 --- a/pkg/connector/handlematrix.go +++ b/pkg/connector/handlematrix.go @@ -273,9 +273,12 @@ func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.M return fmt.Errorf("failed to parse portal ID: %w", err) } - waMsg, _, err := wa.Main.MsgConv.ToWhatsApp(ctx, wa.Client, edit.Event, edit.Content, nil, nil, edit.Portal) - if err != nil { - return wrapConversionError(fmt.Errorf("failed to convert message: %w", err)) + waMsg := wa.Main.MsgConv.CaptionEditToWhatsApp(ctx, wa.Client, edit.Content, edit.Portal) + if waMsg == nil { + waMsg, _, err = wa.Main.MsgConv.ToWhatsApp(ctx, wa.Client, edit.Event, edit.Content, nil, nil, edit.Portal) + if err != nil { + return wrapConversionError(fmt.Errorf("failed to convert message: %w", err)) + } } defer wa.mcTrack(edit, time.Now(), &retErr) diff --git a/pkg/msgconv/from-matrix.go b/pkg/msgconv/from-matrix.go index ba2adc23..324628f2 100644 --- a/pkg/msgconv/from-matrix.go +++ b/pkg/msgconv/from-matrix.go @@ -204,6 +204,36 @@ func (mc *MessageConverter) ToWhatsApp( return message, extra, nil } +func (mc *MessageConverter) CaptionEditToWhatsApp( + ctx context.Context, + client *whatsmeow.Client, + content *event.MessageEventContent, + portal *bridgev2.Portal, +) *waE2E.Message { + if content.MsgType != event.MsgImage && content.MsgType != event.MsgVideo && content.MsgType != event.MsgFile { + return nil + } + ctx = context.WithValue(ctx, contextKeyClient, client) + ctx = context.WithValue(ctx, contextKeyPortal, portal) + contextInfo := mc.generateContextInfo(ctx, nil, content.RelatesTo, portal, content.BeeperDisappearingTimer, content.Mentions != nil && content.Mentions.Room) + var caption string + if content.FileName != "" && content.Body != content.FileName { + caption, contextInfo.MentionedJID = mc.parseText(ctx, content) + } + switch { + case content.MsgType == event.MsgFile: + return &waE2E.Message{DocumentWithCaptionMessage: &waE2E.FutureProofMessage{ + Message: &waE2E.Message{ + DocumentMessage: &waE2E.DocumentMessage{Caption: proto.String(caption), ContextInfo: contextInfo}, + }, + }} + case content.MsgType == event.MsgVideo, content.GetInfo().MimeType == "image/gif": + return &waE2E.Message{VideoMessage: &waE2E.VideoMessage{Caption: proto.String(caption), ContextInfo: contextInfo}} + default: + return &waE2E.Message{ImageMessage: &waE2E.ImageMessage{Caption: proto.String(caption), ContextInfo: contextInfo}} + } +} + func (mc *MessageConverter) constructMediaMessage( ctx context.Context, content *event.MessageEventContent, From d9525654ae45c6ae97890f69a772b475781a17e7 Mon Sep 17 00:00:00 2001 From: Gerardo Rodriguez Date: Tue, 10 Nov 2026 06:14:14 +0000 Subject: [PATCH 2/7] handlematrix: match GIF edits to how GIFs were sent --- pkg/msgconv/from-matrix.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/msgconv/from-matrix.go b/pkg/msgconv/from-matrix.go index 324628f2..09fad3e0 100644 --- a/pkg/msgconv/from-matrix.go +++ b/pkg/msgconv/from-matrix.go @@ -210,7 +210,7 @@ func (mc *MessageConverter) CaptionEditToWhatsApp( content *event.MessageEventContent, portal *bridgev2.Portal, ) *waE2E.Message { - if content.MsgType != event.MsgImage && content.MsgType != event.MsgVideo && content.MsgType != event.MsgFile { + if (content.MsgType != event.MsgImage && content.MsgType != event.MsgVideo && content.MsgType != event.MsgFile) || content.GetInfo().MimeType == "" { return nil } ctx = context.WithValue(ctx, contextKeyClient, client) @@ -221,14 +221,14 @@ func (mc *MessageConverter) CaptionEditToWhatsApp( caption, contextInfo.MentionedJID = mc.parseText(ctx, content) } switch { + case content.MsgType == event.MsgVideo, content.Info.MimeType == "image/gif": + return &waE2E.Message{VideoMessage: &waE2E.VideoMessage{Caption: proto.String(caption), ContextInfo: contextInfo}} case content.MsgType == event.MsgFile: return &waE2E.Message{DocumentWithCaptionMessage: &waE2E.FutureProofMessage{ Message: &waE2E.Message{ DocumentMessage: &waE2E.DocumentMessage{Caption: proto.String(caption), ContextInfo: contextInfo}, }, }} - case content.MsgType == event.MsgVideo, content.GetInfo().MimeType == "image/gif": - return &waE2E.Message{VideoMessage: &waE2E.VideoMessage{Caption: proto.String(caption), ContextInfo: contextInfo}} default: return &waE2E.Message{ImageMessage: &waE2E.ImageMessage{Caption: proto.String(caption), ContextInfo: contextInfo}} } From a15089b18d41c3f3692d72b10d96d8a2aa9b7432 Mon Sep 17 00:00:00 2001 From: "indent[bot]" <297468268+indent[bot]@users.noreply.github.com> Date: Tue, 10 Nov 2026 06:19:41 -0700 Subject: [PATCH 3/7] backfill: skip unparseable history messages without content (#1046) Co-authored-by: Indent --- pkg/connector/backfill.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/connector/backfill.go b/pkg/connector/backfill.go index 8f006e0b..e2c7d114 100644 --- a/pkg/connector/backfill.go +++ b/pkg/connector/backfill.go @@ -293,7 +293,10 @@ func (wa *WhatsAppClient) handleWAHistorySync( for i, rawMsg := range rawMessages { // Don't store messages that will just be skipped. msgEvt, err := wa.Client.ParseWebMessage(jid, rawMsg.GetMessage()) - if err != nil { + if err != nil && getMessageType(rawMsg.GetMessage().GetMessage()) == "ignore" { + ignoredTypes++ + continue + } else if err != nil { log.Warn().Err(err). Int("msg_index", i). Str("msg_id", rawMsg.GetMessage().GetKey().GetID()). From 7cf259940d817643acbeabc793ed5fb2ca409504 Mon Sep 17 00:00:00 2001 From: Gerardo Rodriguez Date: Tue, 10 Nov 2026 19:06:21 +0000 Subject: [PATCH 4/7] msgconv/from-matrix: build caption edits through constructMediaMessage --- pkg/connector/handlematrix.go | 2 +- pkg/msgconv/from-matrix.go | 34 ++++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/pkg/connector/handlematrix.go b/pkg/connector/handlematrix.go index cc2e8436..935d7628 100644 --- a/pkg/connector/handlematrix.go +++ b/pkg/connector/handlematrix.go @@ -273,7 +273,7 @@ func (wa *WhatsAppClient) HandleMatrixEdit(ctx context.Context, edit *bridgev2.M return fmt.Errorf("failed to parse portal ID: %w", err) } - waMsg := wa.Main.MsgConv.CaptionEditToWhatsApp(ctx, wa.Client, edit.Content, edit.Portal) + waMsg := wa.Main.MsgConv.CaptionEditToWhatsApp(ctx, wa.Client, edit.Event, edit.Content, edit.Portal) if waMsg == nil { waMsg, _, err = wa.Main.MsgConv.ToWhatsApp(ctx, wa.Client, edit.Event, edit.Content, nil, nil, edit.Portal) if err != nil { diff --git a/pkg/msgconv/from-matrix.go b/pkg/msgconv/from-matrix.go index 09fad3e0..c45a2205 100644 --- a/pkg/msgconv/from-matrix.go +++ b/pkg/msgconv/from-matrix.go @@ -207,30 +207,40 @@ func (mc *MessageConverter) ToWhatsApp( func (mc *MessageConverter) CaptionEditToWhatsApp( ctx context.Context, client *whatsmeow.Client, + evt *event.Event, content *event.MessageEventContent, portal *bridgev2.Portal, ) *waE2E.Message { - if (content.MsgType != event.MsgImage && content.MsgType != event.MsgVideo && content.MsgType != event.MsgFile) || content.GetInfo().MimeType == "" { + mime := content.GetInfo().MimeType + if mime == "" { return nil + } else if mime == "image/gif" { + content.MsgType = event.MsgVideo } ctx = context.WithValue(ctx, contextKeyClient, client) ctx = context.WithValue(ctx, contextKeyPortal, portal) contextInfo := mc.generateContextInfo(ctx, nil, content.RelatesTo, portal, content.BeeperDisappearingTimer, content.Mentions != nil && content.Mentions.Room) - var caption string - if content.FileName != "" && content.Body != content.FileName { - caption, contextInfo.MentionedJID = mc.parseText(ctx, content) - } + msg := mc.constructMediaMessage(ctx, content, evt, &whatsmeow.UploadResponse{}, nil, contextInfo, mime) switch { - case content.MsgType == event.MsgVideo, content.Info.MimeType == "image/gif": - return &waE2E.Message{VideoMessage: &waE2E.VideoMessage{Caption: proto.String(caption), ContextInfo: contextInfo}} - case content.MsgType == event.MsgFile: + case msg.GetImageMessage() != nil: + return &waE2E.Message{ImageMessage: &waE2E.ImageMessage{ + Caption: msg.ImageMessage.Caption, + ContextInfo: contextInfo, + }} + case msg.GetVideoMessage() != nil: + return &waE2E.Message{VideoMessage: &waE2E.VideoMessage{ + Caption: msg.VideoMessage.Caption, + ContextInfo: contextInfo, + }} + case msg.GetDocumentMessage() != nil, msg.GetDocumentWithCaptionMessage() != nil: return &waE2E.Message{DocumentWithCaptionMessage: &waE2E.FutureProofMessage{ - Message: &waE2E.Message{ - DocumentMessage: &waE2E.DocumentMessage{Caption: proto.String(caption), ContextInfo: contextInfo}, - }, + Message: &waE2E.Message{DocumentMessage: &waE2E.DocumentMessage{ + Caption: proto.String(msg.GetDocumentWithCaptionMessage().GetMessage().GetDocumentMessage().GetCaption()), + ContextInfo: contextInfo, + }}, }} default: - return &waE2E.Message{ImageMessage: &waE2E.ImageMessage{Caption: proto.String(caption), ContextInfo: contextInfo}} + return nil } } From 015ad733a3ef8a8776266b0c490ef6c740fe2ed8 Mon Sep 17 00:00:00 2001 From: "indent[bot]" <297468268+indent[bot]@users.noreply.github.com> Date: Wed, 11 Nov 2026 00:53:07 +0000 Subject: [PATCH 5/7] msgconv: log size breakdown of converted parts over the cut-off limit (#1047) Co-authored-by: Indent --- pkg/msgconv/from-whatsapp.go | 1 + pkg/msgconv/wa-text.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/pkg/msgconv/from-whatsapp.go b/pkg/msgconv/from-whatsapp.go index db18f35a..ec273076 100644 --- a/pkg/msgconv/from-whatsapp.go +++ b/pkg/msgconv/from-whatsapp.go @@ -322,6 +322,7 @@ func (mc *MessageConverter) ToMatrix( cm.ThreadRoot = ptr.Ptr(waid.MakeMessageID(chat, pcp, commentTarget.GetID())) } mc.cutOffLongMessage(part.Content) + logOversizedPart(ctx, part) return cm } diff --git a/pkg/msgconv/wa-text.go b/pkg/msgconv/wa-text.go index 52874fd8..7afcc81f 100644 --- a/pkg/msgconv/wa-text.go +++ b/pkg/msgconv/wa-text.go @@ -18,6 +18,7 @@ package msgconv import ( "context" + "encoding/json" "fmt" "html" "regexp" @@ -25,6 +26,7 @@ import ( "strconv" "strings" + "github.com/rs/zerolog" "go.mau.fi/whatsmeow/proto/waE2E" "maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/event" @@ -72,6 +74,36 @@ func (mc *MessageConverter) cutOffLongMessage(content *event.MessageEventContent } } +func logOversizedPart(ctx context.Context, part *bridgev2.ConvertedMessagePart) { + if part == nil || part.Content == nil { + return + } + contentJSON, _ := json.Marshal(part.Content) + extraJSON, _ := json.Marshal(part.Extra) + if len(contentJSON)+len(extraJSON) <= 40000 { + return + } + extraKeys := make([]string, 0, len(part.Extra)) + for key := range part.Extra { + extraKeys = append(extraKeys, key) + } + var mentionCount int + if part.Content.Mentions != nil { + mentionCount = len(part.Content.Mentions.UserIDs) + } + linkPreviewJSON, _ := json.Marshal(part.Content.BeeperLinkPreviews) + zerolog.Ctx(ctx).Warn(). + Str("msg_type", string(part.Content.MsgType)). + Int("content_json_size", len(contentJSON)). + Int("extra_json_size", len(extraJSON)). + Int("body_size", len(part.Content.Body)). + Int("formatted_body_size", len(part.Content.FormattedBody)). + Int("mention_count", mentionCount). + Int("link_preview_json_size", len(linkPreviewJSON)). + Strs("extra_keys", extraKeys). + Msg("Converted message part is larger than the cut-off limit") +} + func (mc *MessageConverter) parseFormatting(content *event.MessageEventContent, allowInlineURL, forceHTML bool) { parsedHTML := parseWAFormattingToHTML(content.Body, allowInlineURL) if forceHTML || parsedHTML != event.TextToHTML(content.Body) { From 7851e95028c35f5dd9776c3bfd90ac9f4964f4f1 Mon Sep 17 00:00:00 2001 From: "indent[bot]" <297468268+indent[bot]@users.noreply.github.com> Date: Thu, 12 Nov 2026 06:06:29 -0700 Subject: [PATCH 6/7] msgconv: don't look up LID mentions without a client (#1050) Co-authored-by: Indent --- pkg/msgconv/from-whatsapp.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/msgconv/from-whatsapp.go b/pkg/msgconv/from-whatsapp.go index ec273076..e2ab92cd 100644 --- a/pkg/msgconv/from-whatsapp.go +++ b/pkg/msgconv/from-whatsapp.go @@ -76,8 +76,7 @@ func (mc *MessageConverter) getBasicUserInfo(ctx context.Context, user types.JID var pnJID types.JID if user.Server == types.DefaultUserServer { pnJID = user - } else if user.Server == types.HiddenUserServer { - cli := getClient(ctx) + } else if cli := getClient(ctx); user.Server == types.HiddenUserServer && cli != nil { if user.User == cli.Store.GetLID().User { pnJID = cli.Store.GetJID() } else { From 37055ae4fcc8d5541ab9819f8bea94095d33d862 Mon Sep 17 00:00:00 2001 From: "indent[bot]" <297468268+indent[bot]@users.noreply.github.com> Date: Thu, 12 Nov 2026 06:07:31 -0700 Subject: [PATCH 7/7] wadb: index history sync messages by chat and timestamp (#1051) Co-authored-by: Indent --- pkg/connector/wadb/upgrades/00-latest-schema.sql | 4 +++- .../wadb/upgrades/12-history-sync-message-timestamp-index.sql | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 pkg/connector/wadb/upgrades/12-history-sync-message-timestamp-index.sql diff --git a/pkg/connector/wadb/upgrades/00-latest-schema.sql b/pkg/connector/wadb/upgrades/00-latest-schema.sql index c4172d09..cd02333f 100644 --- a/pkg/connector/wadb/upgrades/00-latest-schema.sql +++ b/pkg/connector/wadb/upgrades/00-latest-schema.sql @@ -1,4 +1,4 @@ --- v0 -> v11 (compatible with v3+): Latest revision +-- v0 -> v12 (compatible with v3+): Latest revision CREATE TABLE whatsapp_poll_option_id ( bridge_id TEXT NOT NULL, @@ -50,6 +50,8 @@ CREATE TABLE whatsapp_history_sync_message ( REFERENCES whatsapp_history_sync_conversation (bridge_id, user_login_id, chat_jid) ON UPDATE CASCADE ON DELETE CASCADE ); +CREATE INDEX whatsapp_history_sync_message_chat_ts_idx ON whatsapp_history_sync_message (bridge_id, user_login_id, chat_jid, timestamp); + CREATE TABLE whatsapp_media_backfill_request ( bridge_id TEXT NOT NULL, user_login_id TEXT NOT NULL, diff --git a/pkg/connector/wadb/upgrades/12-history-sync-message-timestamp-index.sql b/pkg/connector/wadb/upgrades/12-history-sync-message-timestamp-index.sql new file mode 100644 index 00000000..0d3b910a --- /dev/null +++ b/pkg/connector/wadb/upgrades/12-history-sync-message-timestamp-index.sql @@ -0,0 +1,2 @@ +-- v12 (compatible with v3+): Add index for history sync message timestamp lookups +CREATE INDEX whatsapp_history_sync_message_chat_ts_idx ON whatsapp_history_sync_message (bridge_id, user_login_id, chat_jid, timestamp);