X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/8bcd8d87d219ae0496986cba4bd6b89f3b2ad6f6..d783df510a58b1dbed973cbc193a57b7ad700f68:/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
index c64d19cc..25647e4e 100644
--- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
@@ -50,18 +50,18 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
     ) throws CommandException {
         final var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
 
-        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), m.getUsername());
+        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), m.getSelfNumber());
 
         try {
             try {
                 final var results = m.quitGroup(groupId, groupAdmins);
-                final var timestamp = results.getTimestamp();
+                final var timestamp = results.timestamp();
                 outputResult(outputWriter, timestamp);
-                handleSendMessageResults(results.getResults());
+                handleSendMessageResults(results.results());
             } catch (NotAGroupMemberException e) {
                 logger.info("User is not a group member");
             }
-            if (ns.getBoolean("delete")) {
+            if (Boolean.TRUE.equals(ns.getBoolean("delete"))) {
                 logger.debug("Deleting group {}", groupId);
                 m.deleteGroup(groupId);
             }
@@ -70,7 +70,7 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
                     + e.getMessage()
                     + " ("
                     + e.getClass().getSimpleName()
-                    + ")");
+                    + ")", e);
         } catch (GroupNotFoundException e) {
             throw new UserErrorException("Failed to send to group: " + e.getMessage());
         } catch (LastGroupAdminException e) {
@@ -79,8 +79,7 @@ public class QuitGroupCommand implements JsonRpcLocalCommand {
     }
 
     private void outputResult(final OutputWriter outputWriter, final long timestamp) {
-        if (outputWriter instanceof PlainTextWriter) {
-            final var writer = (PlainTextWriter) outputWriter;
+        if (outputWriter instanceof PlainTextWriter writer) {
             writer.println("{}", timestamp);
         } else {
             final var writer = (JsonWriter) outputWriter;