X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/ae678871ec976f2bcf1cee969e555ca00239f7d8..210466e7d9fe589ddfaba6d8ac82948bbea500d5:/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java

diff --git a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
index 0f6a00bd..720f22e6 100644
--- a/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
+++ b/src/main/java/org/asamk/signal/jsonrpc/SignalJsonRpcCommandHandler.java
@@ -52,7 +52,7 @@ public class SignalJsonRpcCommandHandler {
         this.commandProvider = commandProvider;
     }
 
-    JsonNode handleRequest(
+    public JsonNode handleRequest(
             final ObjectMapper objectMapper, final String method, ContainerNode<?> params
     ) throws JsonRpcException {
         var command = getCommand(method);
@@ -87,7 +87,13 @@ public class SignalJsonRpcCommandHandler {
                 return runCommand(objectMapper, params, new CommandRunnerImpl<>(m, jsonRpcCommand));
             }
 
-            final var manager = getManagerFromParams(params);
+            var manager = getManagerFromParams(params);
+            if (manager == null) {
+                final var managers = c.getManagers();
+                if (managers.size() == 1) {
+                    manager = managers.get(0);
+                }
+            }
             if (manager != null) {
                 return runCommand(objectMapper, params, new CommandRunnerImpl<>(manager, jsonRpcCommand));
             } else {