Extend updateProfile command to set family name

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

diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
index 968a8733385cb6b9079931c3d513551d5b5fa930..ce578f27837221b1e1da5c8d1ad38e002e943c64 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -1,11 +1,13 @@
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;
 package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.impl.Arguments;

-import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;

 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.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.whispersystems.libsignal.util.guava.Optional;

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


@@ -14,29 +16,35 @@ public class UpdateProfileCommand implements LocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        final MutuallyExclusiveGroup avatarOptions = subparser.addMutuallyExclusiveGroup().required(true);
+        subparser.addArgument("--given-name", "--name").help("New profile (given) name");
+        subparser.addArgument("--family-name").help("New profile family name (optional)");
+        subparser.addArgument("--about").help("New profile about text");
+        subparser.addArgument("--about-emoji").help("New profile about emoji");
+
+        final var avatarOptions = subparser.addMutuallyExclusiveGroup();

         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
         avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());
 
         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
         avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());
 

-        subparser.addArgument("--name").required(true).help("New profile name");
-
-        subparser.help("Set a name and avatar image for the user profile");
+        subparser.help("Set a name, about and avatar image for the user profile");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Manager m) {
-        String name = ns.getString("name");
-        String avatarPath = ns.getString("avatar");
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        var givenName = ns.getString("given_name");
+        var familyName = ns.getString("family_name");
+        var about = ns.getString("about");
+        var aboutEmoji = ns.getString("about_emoji");
+        var avatarPath = ns.getString("avatar");

         boolean removeAvatar = ns.getBoolean("remove_avatar");
 
         boolean removeAvatar = ns.getBoolean("remove_avatar");
 

+        Optional<File> avatarFile = removeAvatar
+                ? Optional.absent()
+                : avatarPath == null ? null : Optional.of(new File(avatarPath));
+

         try {
         try {

-            File avatarFile = removeAvatar ? null : new File(avatarPath);
-            m.setProfile(name, avatarFile);
+            m.setProfile(givenName, familyName, about, aboutEmoji, avatarFile);

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

-            System.err.println("UpdateAccount error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Update profile error: " + e.getMessage());

         }
         }

-
-        return 0;

     }
 }
     }
 }