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 78883860416afac9c016c17559532c09ae608b83..be5bf801ab756eeb5bbdfecabc9a75b2b8523250 100644 (file)
--- 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.isNetworkFailure(),
                 sendMessageResult.isUnregisteredFailure(),
                 sendMessageResult.getIdentityFailure() != null,

-                sendMessageResult.getRateLimitFailure() != null,
+                sendMessageResult.getRateLimitFailure() != null || sendMessageResult.getProofRequiredFailure() != null,

                 sendMessageResult.getProofRequiredFailure() == null
                         ? null
                         : new ProofRequiredException(sendMessageResult.getProofRequiredFailure()));
                 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 f81f54c60544dec70ec38fa16895a633e3419901..dd7f235f7be88d65d3f8136089e0c90e94ac8d5b 100644 (file)
--- 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
                 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,
                                         : result.isUnregisteredFailure()
                                                 ? Type.UNREGISTERED_FAILURE
                                                 : Type.IDENTITY_FAILURE,