From 48daaaa81d3f77fd1d27e7ee3994c80a5a77e8fa Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Mon, 20 Sep 2021 12:57:59 -0500
Subject: [PATCH] Ensure `getLastConversationPreview` never returns expired
 messages

---
 ts/sql/Server.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ts/sql/Server.ts b/ts/sql/Server.ts
index 7ff0b690bc..39e662f5ea 100644
--- a/ts/sql/Server.ts
+++ b/ts/sql/Server.ts
@@ -4816,6 +4816,10 @@ function getLastConversationPreview({
       SELECT json FROM messages
       WHERE
         conversationId = $conversationId AND
+        (
+          expiresAt IS NULL OR
+          (expiresAt > $now)
+        ) AND
         (
           type IS NULL
           OR
@@ -4841,6 +4845,7 @@ function getLastConversationPreview({
   ).get({
     conversationId,
     ourConversationId,
+    now: Date.now(),
   });
 
   if (!row) {