From cf495ef7cf6d9b0582cb76bdd59459b3d01acb24 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 3 May 2021 20:43:07 -0400
Subject: [PATCH] Key the message rate limiter to sender e164, not UUID.

---
 .../textsecuregcm/controllers/MessageController.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
index dab3327e2..af6c89463 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java
@@ -244,7 +244,7 @@ public class MessageController {
       assert(destination.isPresent());
 
       if (source.isPresent() && !source.get().isFor(destinationName)) {
-        rateLimiters.getMessagesLimiter().validate(source.get().getUuid() + "__" + destination.get().getUuid());
+        rateLimiters.getMessagesLimiter().validate(source.get().getNumber() + "__" + destination.get().getUuid());
 
         final String senderCountryCode = Util.getCountryCode(source.get().getNumber());
         final String destinationCountryCode = Util.getCountryCode(destination.get().getNumber());