From c16ff9e778df23d198d04757df2541f53a720cfc Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Wed, 4 Mar 2026 11:47:26 -0600
Subject: [PATCH] Prevent deleted messages from being pinned

Co-authored-by: Jamie <113370520+jamiebuilds-signal@users.noreply.github.com>
---
 ts/messageModifiers/PinnedMessages.preload.ts | 4 ++++
 ts/state/selectors/message.preload.ts         | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ts/messageModifiers/PinnedMessages.preload.ts b/ts/messageModifiers/PinnedMessages.preload.ts
index 2fec799352..78c38fddd6 100644
--- a/ts/messageModifiers/PinnedMessages.preload.ts
+++ b/ts/messageModifiers/PinnedMessages.preload.ts
@@ -224,6 +224,10 @@ function validatePinnedMessageTarget(
     return { error: 'Sender does not have access to edit group attributes' };
   }
 
+  if (message.deletedForEveryone) {
+    return { error: 'Cannot pin deleted message' };
+  }
+
   if (isGiftBadge(message)) {
     return { error: 'Cannot pin gift badge messages' };
   }
diff --git a/ts/state/selectors/message.preload.ts b/ts/state/selectors/message.preload.ts
index a5331740fc..8900acc580 100644
--- a/ts/state/selectors/message.preload.ts
+++ b/ts/state/selectors/message.preload.ts
@@ -2427,6 +2427,9 @@ export function canPinMessage(
   if (!canPinMessages(conversation)) {
     return false;
   }
+  if (message.deletedForEveryone) {
+    return false;
+  }
   if (isGiftBadge(message)) {
     return false;
   }