From 8d8e0329cf59ea3c340bf20ba2bc0937d421dbda Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 22 May 2025 11:59:12 -0700
Subject: [PATCH] Be more lenient to misplaced pni in conversations

---
 ts/services/backups/export.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ts/services/backups/export.ts b/ts/services/backups/export.ts
index ef5fa294532..730c02db204 100644
--- a/ts/services/backups/export.ts
+++ b/ts/services/backups/export.ts
@@ -1032,11 +1032,13 @@ export class BackupExportStream extends Readable {
 
       const { nicknameGivenName, nicknameFamilyName, note } = convo;
 
+      const maybePni = convo.pni ?? convo.serviceId;
+
       const aci = isAciString(convo.serviceId)
         ? Aci.parseFromServiceIdString(convo.serviceId).getRawUuidBytes()
         : null;
-      const pni = isPniString(convo.pni)
-        ? Pni.parseFromServiceIdString(convo.pni).getRawUuidBytes()
+      const pni = isPniString(maybePni)
+        ? Pni.parseFromServiceIdString(maybePni).getRawUuidBytes()
         : null;
       const e164 = convo.e164 ? Long.fromString(convo.e164) : null;