Early preparations for PNP Contact Merging

2022-08-09 14:39:00 -07:00
parent 2f5dd73e58
commit faf6c41332
30 changed files with 1572 additions and 447 deletions
--- a/ts/util/findStoryMessage.ts
+++ b/ts/util/findStoryMessage.ts
@@ -68,14 +68,14 @@ function isStoryAMatch(
    return false;
  }

-  const authorConversationId = window.ConversationController.ensureContactIds({
+  const authorConversation = window.ConversationController.lookupOrCreate({
    e164: undefined,
    uuid: authorUuid,
  });

  return (
    message.sent_at === sentTimestamp &&
-    getContactId(message) === authorConversationId &&
+    getContactId(message) === authorConversation?.id &&
    (message.conversationId === conversationId ||
      message.conversationId === ourConversationId)
  );