Skip to content

fix: deduplicate URL balloon messages in watch stream #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lesaai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: deduplicate URL balloon messages in watch stream #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion Sources/IMsgCore/MessageStore+Messages.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ extension MessageStore {
\(guidColumn) AS guid, \(associatedGuidColumn) AS associated_guid, \(associatedTypeColumn) AS associated_type,
(SELECT COUNT(*) FROM message_attachment_join maj WHERE maj.message_id = m.ROWID) AS attachments,
\(bodyColumn) AS body,
\(threadOriginatorColumn) AS thread_originator_guid
\(threadOriginatorColumn) AS thread_originator_guid,
m.balloon_bundle_id
FROM message m
LEFT JOIN chat_message_join cmj ON m.ROWID = cmj.message_id
LEFT JOIN handle h ON m.handle_id = h.ROWID
Expand Down Expand Up @@ -217,9 +218,28 @@ extension MessageStore {
threadOriginatorGUID: 15
)

let balloonBundleIDIndex = 16

return try withConnection { db in
var messages: [Message] = []
// Track URL balloon messages to deduplicate link preview re-deliveries.
// iMessage can write multiple rows for the same URL when the link preview resolves,
// producing duplicate messages with balloon_bundle_id = 'com.apple.messages.URLBalloonProvider'.
var seenURLBalloons: Set<String> = []

for row in try db.prepare(sql, bindings) {
// Deduplicate URL balloon messages with the same sender + text
let balloonBundleID = stringValue(row[balloonBundleIDIndex])
if balloonBundleID == "com.apple.messages.URLBalloonProvider" {
let sender = stringValue(row[columns.sender])
let text = stringValue(row[columns.text])
let dedupeKey = "\(sender)|\(text)"
if seenURLBalloons.contains(dedupeKey) {
continue
}
seenURLBalloons.insert(dedupeKey)
}

let decoded = try decodeMessageRow(row, columns: columns, fallbackChatID: chatID)
let replyToGUID = replyToGUID(
associatedGuid: decoded.associatedGUID,
Expand Down