Remove workaround for getBoolean from JsonRpcLocalCommand

[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 925b8c905daacf0ce54dad640cf69153e1806b9f..68bce2d222a0a3756e3b4635aad57517cc5554c9 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -1,85 +1,199 @@
 package org.asamk.signal.commands;
 
 package org.asamk.signal.commands;
 

+import net.sourceforge.argparse4j.impl.Arguments;

 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

-import org.asamk.Signal;
-import org.asamk.signal.util.GroupIdFormatException;
-import org.asamk.signal.util.Util;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.util.Base64;
+import org.asamk.signal.JsonWriter;
+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.manager.AttachmentInvalidException;
+import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.groups.GroupId;
+import org.asamk.signal.manager.groups.GroupLinkState;
+import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.util.CommandUtil;
+import org.asamk.signal.util.ErrorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 

-import java.util.ArrayList;
-import java.util.List;
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;

 
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
+public class UpdateGroupCommand implements JsonRpcLocalCommand {

 
 

-public class UpdateGroupCommand implements DbusCommand {
+    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+
+    @Override
+    public String getName() {
+        return "updateGroup";
+    }

 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        subparser.addArgument("-n", "--name")
-                .help("Specify the new group name.");
-        subparser.addArgument("-a", "--avatar")
-                .help("Specify a new group avatar image file");
-        subparser.addArgument("-m", "--member")
+        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("-m", "--member").nargs("*").help("Specify one or more members to add to the group");
+        subparser.addArgument("-r", "--remove-member")
+                .nargs("*")
+                .help("Specify one or more members to remove from the group");
+        subparser.addArgument("--admin").nargs("*").help("Specify one or more members to make a group admin");
+        subparser.addArgument("--remove-admin")

                 .nargs("*")
                 .nargs("*")

-                .help("Specify one or more members to add to the group");
+                .help("Specify one or more members to remove group admin privileges");
+
+        subparser.addArgument("--reset-link")
+                .action(Arguments.storeTrue())
+                .help("Reset group link and create new link password");
+        subparser.addArgument("--link")
+                .help("Set group link state, with or without admin approval")
+                .choices("enabled", "enabled-with-approval", "disabled");
+
+        subparser.addArgument("--set-permission-add-member")
+                .help("Set permission to add new group members")
+                .choices("every-member", "only-admins");
+        subparser.addArgument("--set-permission-edit-details")
+                .help("Set permission to edit group details")
+                .choices("every-member", "only-admins");
+        subparser.addArgument("--set-permission-send-messages")
+                .help("Set permission to send messages")
+                .choices("every-member", "only-admins");
+
+        subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");

     }
 
     }
 

-    @Override
-    public int handleCommand(final Namespace ns, final Signal signal) {
-        if (!signal.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
+    GroupLinkState getGroupLinkState(String value) throws UserErrorException {
+        if (value == null) {
+            return null;
+        }
+        switch (value) {
+            case "enabled":
+                return GroupLinkState.ENABLED;
+            case "enabled-with-approval":
+            case "enabledWithApproval":
+                return GroupLinkState.ENABLED_WITH_APPROVAL;
+            case "disabled":
+                return GroupLinkState.DISABLED;
+            default:
+                throw new UserErrorException("Invalid group link state: " + value);

         }
         }

+    }

 
 

-        byte[] groupId = null;
-        if (ns.getString("group") != null) {
-            try {
-                groupId = Util.decodeGroupId(ns.getString("group"));
-            } catch (GroupIdFormatException e) {
-                handleGroupIdFormatException(e);
-                return 1;
-            }
+    GroupPermission getGroupPermission(String value) throws UserErrorException {
+        if (value == null) {
+            return null;

         }
         }

-        if (groupId == null) {
-            groupId = new byte[0];
+        switch (value) {
+            case "every-member":
+            case "everyMember":
+                return GroupPermission.EVERY_MEMBER;
+            case "only-admins":
+            case "onlyAdmins":
+                return GroupPermission.ONLY_ADMINS;
+            default:
+                throw new UserErrorException("Invalid group permission: " + value);

         }
         }

+    }

 
 

-        String groupName = ns.getString("name");
-        if (groupName == null) {
-            groupName = "";
-        }
+    @Override
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var groupIdString = ns.getString("group-id");
+        var groupId = CommandUtil.getGroupId(groupIdString);

 
 

-        List<String> groupMembers = ns.getList("member");
-        if (groupMembers == null) {
-            groupMembers = new ArrayList<>();
-        }
+        final var localNumber = m.getSelfNumber();

 
 

-        String groupAvatar = ns.getString("avatar");
-        if (groupAvatar == null) {
-            groupAvatar = "";
-        }
+        var groupName = ns.getString("name");
+        var groupDescription = ns.getString("description");
+        var groupMembers = CommandUtil.getSingleRecipientIdentifiers(ns.getList("member"), localNumber);
+        var groupRemoveMembers = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-member"), localNumber);
+        var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), localNumber);
+        var groupRemoveAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-admin"), localNumber);
+        var groupAvatar = ns.getString("avatar");
+        var groupResetLink = Boolean.TRUE.equals(ns.getBoolean("reset-link"));
+        var groupLinkState = getGroupLinkState(ns.getString("link"));
+        var groupExpiration = ns.getInt("expiration");
+        var groupAddMemberPermission = getGroupPermission(ns.getString("set-permission-add-member"));
+        var groupEditDetailsPermission = getGroupPermission(ns.getString("set-permission-edit-details"));
+        var groupSendMessagesPermission = getGroupPermission(ns.getString("set-permission-send-messages"));

 
         try {
 
         try {

-            byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
-            if (groupId.length != newGroupId.length) {
-                System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
+            boolean isNewGroup = false;
+            Long timestamp = null;
+            if (groupId == null) {
+                isNewGroup = true;
+                var results = m.createGroup(groupName,
+                        groupMembers,
+                        groupAvatar == null ? null : new File(groupAvatar));
+                timestamp = results.second().getTimestamp();
+                ErrorUtils.handleSendMessageResults(results.second().getResults());
+                groupId = results.first();
+                groupName = null;
+                groupMembers = null;
+                groupAvatar = null;
+            }
+
+            var results = m.updateGroup(groupId,
+                    groupName,
+                    groupDescription,
+                    groupMembers,
+                    groupRemoveMembers,
+                    groupAdmins,
+                    groupRemoveAdmins,
+                    groupResetLink,
+                    groupLinkState,
+                    groupAddMemberPermission,
+                    groupEditDetailsPermission,
+                    groupAvatar == null ? null : new File(groupAvatar),
+                    groupExpiration,
+                    groupSendMessagesPermission == null
+                            ? null
+                            : groupSendMessagesPermission == GroupPermission.ONLY_ADMINS);
+            if (results != null) {
+                timestamp = results.getTimestamp();
+                ErrorUtils.handleSendMessageResults(results.getResults());
+            }
+            outputResult(outputWriter, timestamp, isNewGroup ? groupId : null);
+        } catch (AttachmentInvalidException e) {
+            throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new UserErrorException(e.getMessage());
+        } catch (IOException e) {
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                    .getSimpleName() + ")", e);
+        }
+    }
+
+    private void outputResult(final OutputWriter outputWriter, final Long timestamp, final GroupId groupId) {
+        if (outputWriter instanceof PlainTextWriter) {
+            final var writer = (PlainTextWriter) outputWriter;
+            if (groupId != null) {
+                writer.println("Created new group: \"{}\"", groupId.toBase64());
+            }
+            if (timestamp != null) {
+                writer.println("{}", timestamp);
+            }
+        } else {
+            final var writer = (JsonWriter) outputWriter;
+            final var result = new HashMap<>();
+            if (timestamp != null) {
+                result.put("timestamp", timestamp);
+            }
+            if (groupId != null) {
+                result.put("groupId", groupId.toBase64());

             }
             }

-            return 0;
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
-        } catch (Signal.Error.AttachmentInvalid e) {
-            System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
-            return 1;
-        } catch (DBusExecutionException e) {
-            System.err.println("Failed to send message: " + e.getMessage());
-            return 1;
+            writer.write(result);

         }
     }
 }
         }
     }
 }