mirror of
https://github.com/mautrix/whatsapp.git
synced 2026-11-11 16:49:18 -05:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
015ad733a3 |
||
|
|
a15089b18d |
3 changed files with 38 additions and 7 deletions
|
|
@ -293,18 +293,16 @@ 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 {
|
||||
rawMsgType := getMessageType(rawMsg.GetMessage().GetMessage())
|
||||
if rawMsgType == "ignore" {
|
||||
ignoredTypes++
|
||||
continue
|
||||
}
|
||||
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()).
|
||||
Uint64("msg_time_seconds", rawMsg.GetMessage().GetMessageTimestamp()).
|
||||
Stringer("stub_type", rawMsg.GetMessage().GetMessageStubType()).
|
||||
Str("message_type", rawMsgType).
|
||||
Str("message_type", getMessageType(rawMsg.GetMessage().GetMessage())).
|
||||
Bool("from_me", rawMsg.GetMessage().GetKey().GetFromMe()).
|
||||
Msg("Dropping historical message due to parse error")
|
||||
log.Trace().
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue