From 5c8c1fc8358c011891fbf6066f289b9ad5fee223 Mon Sep 17 00:00:00 2001
From: "indent[bot]" <297468268+indent[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2026 18:09:28 +0000
Subject: [PATCH 1/3] handlewhatsapp: ignore HD replacement messages without
 replacement content (#1037)

Co-authored-by: Indent <noreply@indent.com>
---
 pkg/connector/handlewhatsapp.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/connector/handlewhatsapp.go b/pkg/connector/handlewhatsapp.go
index 4391233b..e6174b92 100644
--- a/pkg/connector/handlewhatsapp.go
+++ b/pkg/connector/handlewhatsapp.go
@@ -374,6 +374,14 @@ func (wa *WhatsAppClient) handleWAMessage(ctx context.Context, evt *events.Messa
 	if assocType := messageAssoc.GetAssociationType(); assocType == waE2E.MessageAssociation_HD_IMAGE_DUAL_UPLOAD || assocType == waE2E.MessageAssociation_HD_VIDEO_DUAL_UPLOAD {
 		parentKey := messageAssoc.GetParentMessageKey()
 		protocolMsg, shouldHideEdit := makeHDMediaReplacementEdit(evt.Message, parentKey)
+		if protocolMsg.GetEditedMessage() == nil {
+			wa.UserLogin.Log.Debug().
+				Str("message_id", evt.Info.ID).
+				Str("parent_id", parentKey.GetID()).
+				Stringer("assoc_type", assocType).
+				Msg("Ignoring HD replacement message without replacement content")
+			return
+		}
 		dontRenderEdited = shouldHideEdit
 		wa.UserLogin.Log.Debug().
 			Str("message_id", evt.Info.ID).

From 945474343fcd7579c3d273acb78f6c60c957e2e0 Mon Sep 17 00:00:00 2001
From: "indent[bot]" <297468268+indent[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2026 18:09:56 +0000
Subject: [PATCH 2/3] backfill: log stub and message type of unparseable
 history messages (#1034)

Co-authored-by: Indent <noreply@indent.com>
---
 pkg/connector/backfill.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/connector/backfill.go b/pkg/connector/backfill.go
index cbc7eec8..8f006e0b 100644
--- a/pkg/connector/backfill.go
+++ b/pkg/connector/backfill.go
@@ -298,6 +298,9 @@ func (wa *WhatsAppClient) handleWAHistorySync(
 					Int("msg_index", i).
 					Str("msg_id", rawMsg.GetMessage().GetKey().GetID()).
 					Uint64("msg_time_seconds", rawMsg.GetMessage().GetMessageTimestamp()).
+					Stringer("stub_type", rawMsg.GetMessage().GetMessageStubType()).
+					Str("message_type", getMessageType(rawMsg.GetMessage().GetMessage())).
+					Bool("from_me", rawMsg.GetMessage().GetKey().GetFromMe()).
 					Msg("Dropping historical message due to parse error")
 				log.Trace().
 					Any("web_message_info", rawMsg.GetMessage()).

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/3] backfill: skip unparseable history messages without
 content (#1046)

Co-authored-by: Indent <noreply@indent.com>
---
 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()).