X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e5a67d6ce1312fe118e99b8bc8fb2f55ed1dbcf2..b20978e08e0210d179ec14e4ceeb8f01dad27642:/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java index 3c3562ae..7a5b2601 100644 --- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java @@ -54,35 +54,38 @@ public class JoinGroupCommand implements JsonRpcLocalCommand { try { final var results = m.joinGroup(linkUrl); var newGroupId = results.first(); - if (outputWriter instanceof JsonWriter writer) { - var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results()); - if (!m.getGroup(newGroupId).isMember()) { - writer.write(Map.of("timestamp", - results.second().timestamp(), - "results", - jsonResults, - "groupId", - newGroupId.toBase64(), - "onlyRequested", - true)); - } else { - writer.write(Map.of("timestamp", - results.second().timestamp(), - "results", - jsonResults, - "groupId", - newGroupId.toBase64())); + switch (outputWriter) { + case JsonWriter writer -> { + var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.second().results()); + if (!m.getGroup(newGroupId).isMember()) { + writer.write(Map.of("timestamp", + results.second().timestamp(), + "results", + jsonResults, + "groupId", + newGroupId.toBase64(), + "onlyRequested", + true)); + } else { + writer.write(Map.of("timestamp", + results.second().timestamp(), + "results", + jsonResults, + "groupId", + newGroupId.toBase64())); + } } - } else { - final var writer = (PlainTextWriter) outputWriter; - if (!m.getGroup(newGroupId).isMember()) { - writer.println("Requested to join group \"{}\"", newGroupId.toBase64()); - } else { - writer.println("Joined group \"{}\"", newGroupId.toBase64()); + case PlainTextWriter writer -> { + if (!m.getGroup(newGroupId).isMember()) { + writer.println("Requested to join group \"{}\"", newGroupId.toBase64()); + } else { + writer.println("Joined group \"{}\"", newGroupId.toBase64()); + } + var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second() + .results()); + SendMessageResultUtils.printSendMessageResultErrors(writer, errors); + writer.println("{}", results.second().timestamp()); } - var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.second().results()); - SendMessageResultUtils.printSendMessageResultErrors(writer, errors); - writer.println("{}", results.second().timestamp()); } } catch (IOException e) { throw new IOErrorException("Failed to send message: "