fix: correlate poll update votes

veteranbv · veteranbv · commit 9f3820de20de · 2026-07-03T08:34:22.000-04:00
diff --git a/Sources/IMsgCore/MessagePolls.swift b/Sources/IMsgCore/MessagePolls.swift
@@ -309,6 +309,24 @@ extension MessagePollEvent {
       metadata: metadata
     )
   }
+
+  func resolvingPollReference(pollGUID: String?, originalGUID: String?) -> MessagePollEvent {
+    if self.pollGUID == pollGUID, self.originalGUID == originalGUID {
+      return self
+    }
+    return MessagePollEvent(
+      kind: kind,
+      pollGUID: pollGUID,
+      question: question,
+      options: options,
+      vote: vote,
+      votes: votes,
+      originalGUID: originalGUID,
+      creator: creator,
+      participants: participants,
+      metadata: metadata
+    )
+  }
 }
 
 private struct PollFacts {
diff --git a/Sources/IMsgCore/MessageStore+Polls.swift b/Sources/IMsgCore/MessageStore+Polls.swift
@@ -15,12 +15,17 @@ extension MessageStore {
       }
     guard let pollGUID = candidateGUIDs.first else { return poll }
 
+    let sourcePollGUID = try sourcePollGUID(forAny: candidateGUIDs, db: db) ?? pollGUID
     let optionTexts = try pollOptionTextsByID(
-      pollGUID: pollGUID,
+      pollGUID: sourcePollGUID,
       db: db,
       cache: &cache
     )
-    return poll.resolvingVoteOptionTexts(optionTexts)
+    let resolvedPoll = poll.resolvingVoteOptionTexts(optionTexts)
+    return resolvedPoll.resolvingPollReference(
+      pollGUID: sourcePollGUID,
+      originalGUID: sourcePollGUID
+    )
   }
 
   /// Ordered options of the poll identified by `guid`, decoded from its
@@ -109,4 +114,37 @@ extension MessageStore {
     }
     return options
   }
+
+  private func sourcePollGUID(forAny candidates: [String], db: Connection) throws -> String? {
+    guard schema.hasReactionColumns else { return nil }
+    for candidate in candidates {
+      if let source = try sourcePollGUID(forUpdateRow: candidate, db: db) {
+        return source
+      }
+    }
+    return candidates.first
+  }
+
+  private func sourcePollGUID(forUpdateRow guid: String, db: Connection) throws -> String? {
+    let rows = try db.prepareRowIterator(
+      """
+      SELECT associated_message_guid
+      FROM message
+      WHERE guid = ?
+        AND associated_message_type = ?
+        AND IFNULL(associated_message_guid, '') != ''
+      LIMIT 1
+      """,
+      bindings: [guid, MessagePollDecoder.updateAssociatedMessageType]
+    )
+    guard
+      let row = try rows.failableNext(),
+      let associatedGUID = try row.get(Expression<String?>("associated_message_guid"))
+    else {
+      return nil
+    }
+
+    let normalized = normalizeAssociatedGUID(associatedGUID)
+    return normalized.isEmpty ? nil : normalized
+  }
 }
diff --git a/Tests/IMsgCoreTests/MessagePollTests.swift b/Tests/IMsgCoreTests/MessagePollTests.swift
@@ -549,7 +549,8 @@ func messageStoreResolvesVoteOptionTextFromPollUpdateRows() throws {
   #expect(updateMessage.poll?.originalGUID == "original-poll-guid")
   #expect(updateMessage.poll?.options?.map(\.text) == ["A", "Custom choice"])
   #expect(voteMessage.poll?.kind == .vote)
-  #expect(voteMessage.poll?.originalGUID == "updated-poll-guid")
+  #expect(voteMessage.poll?.pollGUID == "original-poll-guid")
+  #expect(voteMessage.poll?.originalGUID == "original-poll-guid")
   #expect(voteMessage.poll?.vote?.optionID == "choice-custom")
   #expect(voteMessage.poll?.vote?.optionText == "Custom choice")
 }
