connector, msgconv: log expected missing LID and expired thumbnails at debug

pkg/connector/backfill.go

@@ -293,10 +293,7 @@ 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 && getMessageType(rawMsg.GetMessage().GetMessage()) == "ignore" {
-				ignoredTypes++
-				continue
-			} else if err != nil {
+			if err != nil {
 				log.Warn().Err(err).
 					Int("msg_index", i).
 					Str("msg_id", rawMsg.GetMessage().GetKey().GetID()).

pkg/connector/lidmigrate.go

@@ -193,7 +193,7 @@ func (wa *WhatsAppConnector) migrateToLIDDMs(ctx context.Context) error {
 		if err != nil {
 			return fmt.Errorf("failed to get LID for PN portal %s: %w", key.ID, err)
 		} else if lid.IsEmpty() {
-			log.Warn().Stringer("pn", pnJID).Msg("No LID for PN portal")
+			log.Debug().Stringer("pn", pnJID).Msg("No LID for PN portal")
 			wa.unmigratedDMs.Add(key)
 			missingLID++
 			continue

pkg/connector/wadb/upgrades/00-latest-schema.sql

@@ -1,4 +1,4 @@
--- v0 -> v12 (compatible with v3+): Latest revision
+-- v0 -> v11 (compatible with v3+): Latest revision
 
 CREATE TABLE whatsapp_poll_option_id (
     bridge_id TEXT  NOT NULL,
@@ -50,8 +50,6 @@ 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,

pkg/connector/wadb/upgrades/12-history-sync-message-timestamp-index.sql

@@ -1,2 +0,0 @@
--- 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);

pkg/msgconv/from-whatsapp.go

@@ -76,7 +76,8 @@ func (mc *MessageConverter) getBasicUserInfo(ctx context.Context, user types.JID
 	var pnJID types.JID
 	if user.Server == types.DefaultUserServer {
 		pnJID = user
-	} else if cli := getClient(ctx); user.Server == types.HiddenUserServer && cli != nil {
+	} else if user.Server == types.HiddenUserServer {
+		cli := getClient(ctx)
 		if user.User == cli.Store.GetLID().User {
 			pnJID = cli.Store.GetJID()
 		} else {
@@ -321,7 +322,6 @@ func (mc *MessageConverter) ToMatrix(
 		cm.ThreadRoot = ptr.Ptr(waid.MakeMessageID(chat, pcp, commentTarget.GetID()))
 	}
 	mc.cutOffLongMessage(part.Content)
-	logOversizedPart(ctx, part)
 
 	return cm
 }

pkg/msgconv/urlpreview.go

@@ -19,6 +19,7 @@ package msgconv
 import (
 	"bytes"
 	"context"
+	"errors"
 	"image"
 	"net/http"
 	"net/url"
@@ -52,7 +53,9 @@ func (mc *MessageConverter) convertURLPreviewToBeeper(ctx context.Context, msg *
 	if msg.ThumbnailDirectPath != nil {
 		var err error
 		thumbnailData, err = getClient(ctx).DownloadThumbnail(ctx, msg)
-		if err != nil {
+		if errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith403) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith404) || errors.Is(err, whatsmeow.ErrMediaDownloadFailedWith410) {
+			zerolog.Ctx(ctx).Debug().Err(err).Msg("Failed to download thumbnail for link preview")
+		} else if err != nil {
 			zerolog.Ctx(ctx).Err(err).Msg("Failed to download thumbnail for link preview")
 		}
 	}

pkg/msgconv/wa-text.go

@@ -18,7 +18,6 @@ package msgconv
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"html"
 	"regexp"
@@ -26,7 +25,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rs/zerolog"
 	"go.mau.fi/whatsmeow/proto/waE2E"
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/event"
@@ -74,36 +72,6 @@ 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) {