Implement jsonRpc command

[signal-cli] / src / main / java / org / asamk / signal / commands / UpdateGroupCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 6f7f87fdfb2cb985ffd17738a1c6a2613f8ed839..59e393940a687f4e7d7ab181af4d3aa1e969c466 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -7,7 +7,8 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.Signal;
 import org.asamk.signal.GroupLinkState;
 import org.asamk.signal.GroupPermission;
 import org.asamk.Signal;
 import org.asamk.signal.GroupLinkState;
 import org.asamk.signal.GroupPermission;

-import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.PlainTextWriter;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;


@@ -33,10 +34,15 @@ import java.util.List;
 public class UpdateGroupCommand implements DbusCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
 public class UpdateGroupCommand implements DbusCommand, LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);

+    private final OutputWriter outputWriter;

 
 

-    @Override
-    public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+    public UpdateGroupCommand(final OutputWriter outputWriter) {
+        this.outputWriter = outputWriter;
+    }
+
+    public static void attachToSubparser(final Subparser subparser) {
+        subparser.help("Create or update a group.");
+        subparser.addArgument("-g", "--group-id", "--group").help("Specify the group ID.");

         subparser.addArgument("-n", "--name").help("Specify the new group name.");
         subparser.addArgument("-d", "--description").help("Specify the new group description.");
         subparser.addArgument("-a", "--avatar").help("Specify a new group avatar image file");
         subparser.addArgument("-n", "--name").help("Specify the new group name.");
         subparser.addArgument("-d", "--description").help("Specify the new group description.");
         subparser.addArgument("-a", "--avatar").help("Specify a new group avatar image file");


@@ -68,9 +74,9 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
 
     @Override
     public void handleCommand(final Namespace ns, final Manager m) throws CommandException {

-        final var writer = new PlainTextWriterImpl(System.out);
+        final var writer = (PlainTextWriter) outputWriter;

         GroupId groupId = null;
         GroupId groupId = null;

-        final var groupIdString = ns.getString("group");
+        final var groupIdString = ns.getString("group-id");

         if (groupIdString != null) {
             try {
                 groupId = Util.decodeGroupId(groupIdString);
         if (groupIdString != null) {
             try {
                 groupId = Util.decodeGroupId(groupIdString);


@@ -98,22 +104,27 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
                         groupMembers,
                         groupAvatar == null ? null : new File(groupAvatar));
                 ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second());
                         groupMembers,
                         groupAvatar == null ? null : new File(groupAvatar));
                 ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second());

-                final var newGroupId = results.first();
-                writer.println("Created new group: \"{}\"", newGroupId.toBase64());
-            } else {
-                var results = m.updateGroup(groupId,
-                        groupName,
-                        groupDescription,
-                        groupMembers,
-                        groupRemoveMembers,
-                        groupAdmins,
-                        groupRemoveAdmins,
-                        groupResetLink,
-                        groupLinkState != null ? groupLinkState.toLinkState() : null,
-                        groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null,
-                        groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null,
-                        groupAvatar == null ? null : new File(groupAvatar),
-                        groupExpiration);
+                groupId = results.first();
+                writer.println("Created new group: \"{}\"", groupId.toBase64());
+                groupName = null;
+                groupMembers = null;
+                groupAvatar = null;
+            }
+
+            var results = m.updateGroup(groupId,
+                    groupName,
+                    groupDescription,
+                    groupMembers,
+                    groupRemoveMembers,
+                    groupAdmins,
+                    groupRemoveAdmins,
+                    groupResetLink,
+                    groupLinkState != null ? groupLinkState.toLinkState() : null,
+                    groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null,
+                    groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null,
+                    groupAvatar == null ? null : new File(groupAvatar),
+                    groupExpiration);
+            if (results != null) {

                 ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second());
             }
         } catch (AttachmentInvalidException e) {
                 ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second());
             }
         } catch (AttachmentInvalidException e) {


@@ -131,11 +142,11 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
 
     @Override
     public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {

-        final var writer = new PlainTextWriterImpl(System.out);
+        final var writer = (PlainTextWriter) outputWriter;

         byte[] groupId = null;
         byte[] groupId = null;

-        if (ns.getString("group") != null) {
+        if (ns.getString("group-id") != null) {

             try {
             try {

-                groupId = Util.decodeGroupId(ns.getString("group")).serialize();
+                groupId = Util.decodeGroupId(ns.getString("group-id")).serialize();

             } catch (GroupIdFormatException e) {
                 throw new UserErrorException("Invalid group id: " + e.getMessage());
             }
             } catch (GroupIdFormatException e) {
                 throw new UserErrorException("Invalid group id: " + e.getMessage());
             }