diff --git a/pkg/connector/backfill.go b/pkg/connector/backfill.go index e7748ac8..8f006e0b 100644 --- a/pkg/connector/backfill.go +++ b/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()). @@ -405,8 +402,6 @@ func (wa *WhatsAppClient) handleWAHistorySync( return nil } -const historySyncQueuedTimeout = 10 * time.Minute - func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) { log := wa.UserLogin.Log.With(). Str("action", "create portals from history sync"). @@ -450,9 +445,6 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) { // We don't currently support new PSAs, so don't bother backfilling them either wg.Done() continue - } else if queuedAt, ok := wa.historySyncQueued.Get(conv.ChatJID); ok && time.Since(queuedAt) < historySyncQueuedTimeout { - wg.Done() - continue } // TODO can the chat info fetch be avoided entirely? select { @@ -493,7 +485,6 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) { wg.Done() continue } - wa.historySyncQueued.Set(conv.ChatJID, time.Now()) res := wa.UserLogin.QueueRemoteEvent(&simplevent.ChatResync{ EventMeta: simplevent.EventMeta{ Type: bridgev2.RemoteEventChatResync, @@ -509,7 +500,6 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) { if err != nil { zerolog.Ctx(ctx).Err(err).Msg("Failed to mark conversation as bridged") } - wa.historySyncQueued.Delete(conv.ChatJID) wg.Done() }, }, @@ -517,7 +507,6 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) { LatestMessageTS: conv.LastMessageTimestamp, }) if !res.Success { - wa.historySyncQueued.Delete(conv.ChatJID) log.Debug().Msg("Cancelling history sync portal creation loop") return } @@ -525,9 +514,6 @@ func (wa *WhatsAppClient) createPortalsFromHistorySync(ctx context.Context) { log.Info().Int("conversation_count", len(conversations)).Msg("Finished creating portals from history sync") go func() { wg.Wait() - if wa.historySyncQueued.Len() > 0 { - return - } wa.UserLogin.Metadata.(*waid.UserLoginMetadata).HistorySyncPortalsNeedCreating = false err = wa.UserLogin.Save(ctx) if err != nil { diff --git a/pkg/connector/chatinfo.go b/pkg/connector/chatinfo.go index ce8c7396..7447f9c9 100644 --- a/pkg/connector/chatinfo.go +++ b/pkg/connector/chatinfo.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "maps" "time" "github.com/rs/zerolog" @@ -244,6 +245,13 @@ const ( defaultPL = 0 ) +var alwaysAllowedGroupEvents = map[event.Type]int{ + event.EventEncrypted: defaultPL, // Need to always allow encrypted events for poll responses + event.EventReaction: defaultPL, + event.EventRedaction: defaultPL, + event.EventUnstablePollResponse: defaultPL, +} + func setDefaultSubGroupFlag(isCommunityAnnouncementGroup bool) bridgev2.ExtraUpdater[*bridgev2.Portal] { return func(_ context.Context, portal *bridgev2.Portal) bool { meta := portal.Metadata.(*waid.PortalMetadata) @@ -311,10 +319,6 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn event.StateRoomName: metaChangePL, event.StateRoomAvatar: metaChangePL, event.StateTopic: metaChangePL, - event.EventEncrypted: defaultPL, // Need to always allow encrypted events for poll responses - event.EventReaction: defaultPL, - event.EventRedaction: defaultPL, - event.EventUnstablePollResponse: defaultPL, event.StateBeeperDisappearingTimer: metaChangePL, }, }, @@ -326,6 +330,7 @@ func (wa *WhatsAppClient) wrapGroupInfo(ctx context.Context, info *types.GroupIn }, ExtraUpdates: extraUpdater, } + maps.Copy(wrapped.Members.PowerLevels.Events, alwaysAllowedGroupEvents) var hasSelf bool for _, pcp := range info.Participants { member := bridgev2.ChatMember{ @@ -436,24 +441,25 @@ func (wa *WhatsAppClient) wrapGroupInfoChange(ctx context.Context, evt *events.G if memberChanges == nil { memberChanges = &bridgev2.ChatMemberList{} } - memberChanges.PowerLevels = &bridgev2.PowerLevelOverrides{} + memberChanges.PowerLevels = &bridgev2.PowerLevelOverrides{ + Events: make(map[event.Type]int), + } if evt.Announce != nil { if evt.Announce.IsAnnounce { memberChanges.PowerLevels.EventsDefault = ptr.Ptr(adminPL) } else { memberChanges.PowerLevels.EventsDefault = ptr.Ptr(defaultPL) } + maps.Copy(memberChanges.PowerLevels.Events, alwaysAllowedGroupEvents) } if evt.Locked != nil { metaChangePL := defaultPL if evt.Locked.IsLocked { metaChangePL = adminPL } - memberChanges.PowerLevels.Events = map[event.Type]int{ - event.StateRoomName: metaChangePL, - event.StateRoomAvatar: metaChangePL, - event.StateTopic: metaChangePL, - } + memberChanges.PowerLevels.Events[event.StateRoomName] = metaChangePL + memberChanges.PowerLevels.Events[event.StateRoomAvatar] = metaChangePL + memberChanges.PowerLevels.Events[event.StateTopic] = metaChangePL } } return &bridgev2.ChatInfoChange{ diff --git a/pkg/connector/client.go b/pkg/connector/client.go index 9b3f190a..678c8d22 100644 --- a/pkg/connector/client.go +++ b/pkg/connector/client.go @@ -50,7 +50,6 @@ func (wa *WhatsAppConnector) LoadUserLogin(ctx context.Context, login *bridgev2. MC: noopMCInstance, historySyncWakeup: make(chan struct{}, 1), - historySyncQueued: exsync.NewMap[types.JID, time.Time](), resyncQueue: make(map[types.JID]resyncQueueItem), directMediaRetries: make(map[networkid.MessageID]*directMediaRetry), mediaRetryLock: semaphore.NewWeighted(wa.Config.HistorySync.MediaRequests.MaxAsyncHandle), @@ -115,7 +114,6 @@ type WhatsAppClient struct { MC mClient historySyncWakeup chan struct{} - historySyncQueued *exsync.Map[types.JID, time.Time] stopLoops atomic.Pointer[context.CancelFunc] resyncQueue map[types.JID]resyncQueueItem resyncQueueLock sync.Mutex diff --git a/pkg/connector/wadb/upgrades/00-latest-schema.sql b/pkg/connector/wadb/upgrades/00-latest-schema.sql index cd02333f..c4172d09 100644 --- a/pkg/connector/wadb/upgrades/00-latest-schema.sql +++ b/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, 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 deleted file mode 100644 index 0d3b910a..00000000 --- a/pkg/connector/wadb/upgrades/12-history-sync-message-timestamp-index.sql +++ /dev/null @@ -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); diff --git a/pkg/msgconv/from-whatsapp.go b/pkg/msgconv/from-whatsapp.go index e2ab92cd..db18f35a 100644 --- a/pkg/msgconv/from-whatsapp.go +++ b/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 } diff --git a/pkg/msgconv/wa-text.go b/pkg/msgconv/wa-text.go index 7afcc81f..52874fd8 100644 --- a/pkg/msgconv/wa-text.go +++ b/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) {