Fix null pointer regression

[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 397d1fe37d90be94f73fd3e958d590bd42bda515..1231d3d4b50fbca8a2977feb2d5719dacec95010 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,37 +4,35 @@ 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.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.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.Manager;

-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
-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.NotAGroupMemberException;
-import org.asamk.signal.util.ErrorUtils;
-import org.asamk.signal.util.Util;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.SendGroupMessageResults;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.manager.api.UpdateGroup;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
+import org.asamk.signal.util.CommandUtil;
+import org.asamk.signal.util.SendMessageResultUtils;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import org.whispersystems.signalservice.api.util.InvalidNumberException;

 
 

-import java.io.File;

 import java.io.IOException;
 import java.io.IOException;

-import java.util.ArrayList;

 import java.util.HashMap;
 import java.util.HashMap;

-import java.util.List;
+import java.util.stream.Stream;

 
 

-public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand {
+public class UpdateGroupCommand implements JsonRpcLocalCommand {

 
 

-    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {


@@ -56,6 +54,8 @@ public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand {
         subparser.addArgument("--remove-admin")
                 .nargs("*")
                 .help("Specify one or more members to remove group admin privileges");
         subparser.addArgument("--remove-admin")
                 .nargs("*")
                 .help("Specify one or more members to remove group admin privileges");

+        subparser.addArgument("--ban").nargs("*").help("Specify one or more members to ban from joining the group");
+        subparser.addArgument("--unban").nargs("*").help("Specify one or more members to remove from the ban list");

 
         subparser.addArgument("--reset-link")
                 .action(Arguments.storeTrue())
 
         subparser.addArgument("--reset-link")
                 .action(Arguments.storeTrue())


@@ -70,6 +70,9 @@ public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand {
         subparser.addArgument("--set-permission-edit-details")
                 .help("Set permission to edit group details")
                 .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)");
     }
 
         subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
     }


@@ -78,70 +81,59 @@ public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand {
         if (value == null) {
             return null;
         }
         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);
-        }
+        return switch (value) {
+            case "enabled" -> GroupLinkState.ENABLED;
+            case "enabled-with-approval", "enabledWithApproval" -> GroupLinkState.ENABLED_WITH_APPROVAL;
+            case "disabled" -> GroupLinkState.DISABLED;
+            default -> throw new UserErrorException("Invalid group link state: " + value);
+        };

     }
 
     GroupPermission getGroupPermission(String value) throws UserErrorException {
         if (value == null) {
             return null;
         }
     }
 
     GroupPermission getGroupPermission(String value) throws UserErrorException {
         if (value == null) {
             return null;
         }

-        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);
-        }
+        return switch (value) {
+            case "every-member", "everyMember" -> GroupPermission.EVERY_MEMBER;
+            case "only-admins", "onlyAdmins" -> GroupPermission.ONLY_ADMINS;
+            default -> throw new UserErrorException("Invalid group permission: " + value);
+        };

     }
 
     @Override
     public void handleCommand(
     }
 
     @Override
     public void handleCommand(

-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter

     ) throws CommandException {
     ) throws CommandException {

-        GroupId groupId = null;

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

-        if (groupIdString != null) {
-            try {
-                groupId = Util.decodeGroupId(groupIdString);
-            } catch (GroupIdFormatException e) {
-                throw new UserErrorException("Invalid group id: " + e.getMessage());
-            }
-        }
+        var groupId = CommandUtil.getGroupId(groupIdString);
+
+        final var localNumber = m.getSelfNumber();

 
         var groupName = ns.getString("name");
         var groupDescription = ns.getString("description");
 
         var groupName = ns.getString("name");
         var groupDescription = ns.getString("description");

-        var groupMembers = ns.<String>getList("member");
-        var groupRemoveMembers = ns.<String>getList("remove-member");
-        var groupAdmins = ns.<String>getList("admin");
-        var groupRemoveAdmins = ns.<String>getList("remove-admin");
+        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 groupBan = CommandUtil.getSingleRecipientIdentifiers(ns.getList("ban"), localNumber);
+        var groupUnban = CommandUtil.getSingleRecipientIdentifiers(ns.getList("unban"), localNumber);

         var groupAvatar = ns.getString("avatar");
         var groupAvatar = ns.getString("avatar");

-        var groupResetLink = ns.getBoolean("reset-link");
+        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 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 {
             boolean isNewGroup = false;
 
         try {
             boolean isNewGroup = false;

+            SendGroupMessageResults groupMessageResults = null;

             if (groupId == null) {
                 isNewGroup = true;
             if (groupId == null) {
                 isNewGroup = true;

-                var results = m.createGroup(groupName,
-                        groupMembers,
-                        groupAvatar == null ? null : new File(groupAvatar));
-                ErrorUtils.handleSendMessageResults(results.second());
+                var results = m.createGroup(groupName, groupMembers, groupAvatar);
+                groupMessageResults = results.second();

                 groupId = results.first();
                 groupName = null;
                 groupMembers = null;
                 groupId = results.first();
                 groupName = null;
                 groupMembers = null;


@@ -149,99 +141,74 @@ public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand {
             }
 
             var results = m.updateGroup(groupId,
             }
 
             var results = m.updateGroup(groupId,

-                    groupName,
-                    groupDescription,
-                    groupMembers,
-                    groupRemoveMembers,
-                    groupAdmins,
-                    groupRemoveAdmins,
-                    groupResetLink,
-                    groupLinkState,
-                    groupAddMemberPermission,
-                    groupEditDetailsPermission,
-                    groupAvatar == null ? null : new File(groupAvatar),
-                    groupExpiration);
-            Long timestamp = null;
+                    UpdateGroup.newBuilder()
+                            .withName(groupName)
+                            .withDescription(groupDescription)
+                            .withMembers(groupMembers)
+                            .withRemoveMembers(groupRemoveMembers)
+                            .withAdmins(groupAdmins)
+                            .withRemoveAdmins(groupRemoveAdmins)
+                            .withBanMembers(groupBan)
+                            .withUnbanMembers(groupUnban)
+                            .withResetGroupLink(groupResetLink)
+                            .withGroupLinkState(groupLinkState)
+                            .withAddMemberPermission(groupAddMemberPermission)
+                            .withEditDetailsPermission(groupEditDetailsPermission)
+                            .withAvatarFile(groupAvatar)
+                            .withExpirationTimer(groupExpiration)
+                            .withIsAnnouncementGroup(groupSendMessagesPermission == null
+                                    ? null
+                                    : groupSendMessagesPermission == GroupPermission.ONLY_ADMINS)
+                            .build());

             if (results != null) {
             if (results != null) {

-                timestamp = results.first();
-                ErrorUtils.handleSendMessageResults(results.second());
+                if (groupMessageResults == null) {
+                    groupMessageResults = results;
+                } else {
+                    groupMessageResults = new SendGroupMessageResults(results.timestamp(),
+                            Stream.concat(groupMessageResults.results().stream(), results.results().stream()).toList());
+                }

             }
             }

-            outputResult(outputWriter, timestamp, isNewGroup ? groupId : null);
+            outputResult(outputWriter, groupMessageResults, isNewGroup ? groupId : null);

         } catch (AttachmentInvalidException e) {
             throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
         } catch (AttachmentInvalidException e) {
             throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());

-        } catch (GroupNotFoundException e) {
-            logger.warn("Unknown group id: {}", groupIdString);
-        } catch (NotAGroupMemberException e) {
-            logger.warn("You're not a group member");
-        } catch (InvalidNumberException e) {
-            throw new UserErrorException("Failed to parse member number: " + e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new UserErrorException(e.getMessage());
+        } catch (UnregisteredRecipientException e) {
+            throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");

         } catch (IOException e) {
         } catch (IOException e) {

-            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+                    .getSimpleName() + ")", e);

         }
     }
 
         }
     }
 

-    @Override
-    public void handleCommand(
-            final Namespace ns, final Signal signal, final OutputWriter outputWriter
-    ) throws CommandException {
-        byte[] groupId = null;
-        if (ns.getString("group-id") != null) {
-            try {
-                groupId = Util.decodeGroupId(ns.getString("group-id")).serialize();
-            } catch (GroupIdFormatException e) {
-                throw new UserErrorException("Invalid group id: " + e.getMessage());
-            }
-        }
-        if (groupId == null) {
-            groupId = new byte[0];
-        }
-
-        var groupName = ns.getString("name");
-        if (groupName == null) {
-            groupName = "";
-        }
-
-        List<String> groupMembers = ns.getList("member");
-        if (groupMembers == null) {
-            groupMembers = new ArrayList<>();
-        }
-
-        var groupAvatar = ns.getString("avatar");
-        if (groupAvatar == null) {
-            groupAvatar = "";
-        }
-
-        try {
-            var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
-            if (groupId.length != newGroupId.length) {
-                outputResult(outputWriter, null, GroupId.unknownVersion(newGroupId));
-            }
-        } catch (Signal.Error.AttachmentInvalid e) {
-            throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
-        } catch (DBusExecutionException e) {
-            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
-        }
-    }
-
-    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);
+    private void outputResult(
+            final OutputWriter outputWriter,
+            final SendGroupMessageResults results,
+            final GroupId groupId
+    ) {
+        switch (outputWriter) {
+            case PlainTextWriter writer -> {
+                if (groupId != null) {
+                    writer.println("Created new group: \"{}\"", groupId.toBase64());
+                }
+                if (results != null) {
+                    var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
+                    SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+                    writer.println("{}", results.timestamp());
+                }

             }
             }

-            if (groupId != null) {
-                result.put("groupId", groupId.toBase64());
+            case JsonWriter writer -> {
+                final var response = new HashMap<>();
+                if (results != null) {
+                    response.put("timestamp", results.timestamp());
+                    var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
+                    response.put("results", jsonResults);
+                }
+                if (groupId != null) {
+                    response.put("groupId", groupId.toBase64());
+                }
+                writer.write(response);

             }
             }

-            writer.write(result);

         }
     }
 }
         }
     }
 }