From afd645fb11034eac913ce12e9502430a9891a376 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 3 Sep 2020 13:25:28 -0400
Subject: [PATCH] Retrieve messages using commands available in Redis 3.

---
 .../textsecuregcm/workers/ScourMessageCacheCommand.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ScourMessageCacheCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ScourMessageCacheCommand.java
index 546a69e1a..1505ad563 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/ScourMessageCacheCommand.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/ScourMessageCacheCommand.java
@@ -80,7 +80,9 @@ public class ScourMessageCacheCommand extends ConfiguredCommand<WhisperServerCon
         List<ScoredValue<byte[]>> messages;
 
         do {
-            messages = redisClient.withBinaryClient(connection -> connection.sync().zpopmin(queueKeyBytes, MESSAGE_PAGE_SIZE));
+            final int start = messageCount;
+
+            messages = redisClient.withBinaryClient(connection -> connection.sync().zrangeWithScores(queueKeyBytes, start, start + MESSAGE_PAGE_SIZE));
 
             for (final ScoredValue<byte[]> scoredValue : messages) {
                 persistMessage(accountNumber, deviceId, scoredValue.getValue());