From: AsamK <asamk@gmx.de>
Date: Wed, 6 Apr 2022 20:35:51 +0000 (+0200)
Subject: Output RATE_LIMIT_FAILURE type more reliably in json output
X-Git-Tag: v0.10.5~6
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/2c159952893123b190f66bd10370a4b12c3471d2

Output RATE_LIMIT_FAILURE type more reliably in json output

Fixes #923
---

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
index 78883860..be5bf801 100644
--- a/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/SendMessageResult.java
@@ -48,7 +48,7 @@ public record SendMessageResult(
                 sendMessageResult.isNetworkFailure(),
                 sendMessageResult.isUnregisteredFailure(),
                 sendMessageResult.getIdentityFailure() != null,
-                sendMessageResult.getRateLimitFailure() != null,
+                sendMessageResult.getRateLimitFailure() != null || sendMessageResult.getProofRequiredFailure() != null,
                 sendMessageResult.getProofRequiredFailure() == null
                         ? null
                         : new ProofRequiredException(sendMessageResult.getProofRequiredFailure()));
diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
index f81f54c6..dd7f235f 100644
--- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
+++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
@@ -22,10 +22,10 @@ public record JsonSendMessageResult(
                 groupId != null ? groupId.toBase64() : null,
                 result.isSuccess()
                         ? Type.SUCCESS
-                        : result.isNetworkFailure()
-                                ? Type.NETWORK_FAILURE
-                                : result.isRateLimitFailure()
-                                        ? Type.RATE_LIMIT_FAILURE
+                        : result.isRateLimitFailure()
+                                ? Type.RATE_LIMIT_FAILURE
+                                : result.isNetworkFailure()
+                                        ? Type.NETWORK_FAILURE
                                         : result.isUnregisteredFailure()
                                                 ? Type.UNREGISTERED_FAILURE
                                                 : Type.IDENTITY_FAILURE,