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/markConversationRead.ts
+++ b/ts/util/markConversationRead.ts
@@ -89,10 +89,10 @@ export async function markConversationRead(
      originalReadStatus: messageSyncData.originalReadStatus,
      senderE164: messageSyncData.source,
      senderUuid: messageSyncData.sourceUuid,
-      senderId: window.ConversationController.ensureContactIds({
+      senderId: window.ConversationController.lookupOrCreate({
        e164: messageSyncData.source,
        uuid: messageSyncData.sourceUuid,
-      }),
+      })?.id,
      timestamp: messageSyncData.sent_at,
      hasErrors: message ? hasErrors(message.attributes) : false,
    };