X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/a811d1a05a28d332705f30528db882a1031e8257..9f60ed534a6198b231af521932b959685e0b903b:/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 35190fe8..cea2da0d 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java
@@ -1,49 +1,68 @@
 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 org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
-import org.whispersystems.libsignal.util.guava.Optional;
+import org.asamk.signal.manager.api.UpdateProfile;
+import org.asamk.signal.output.OutputWriter;
 
-import java.io.File;
 import java.io.IOException;
+import java.util.Base64;
 
-public class UpdateProfileCommand implements LocalCommand {
+public class UpdateProfileCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "updateProfile";
+    }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("--name").help("New profile name");
+        subparser.help("Set a name, about and avatar image for the user profile");
+        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");
+        subparser.addArgument("--mobile-coin-address").help("New MobileCoin address (Base64 encoded public address)");
 
-        final MutuallyExclusiveGroup avatarOptions = subparser.addMutuallyExclusiveGroup();
+        final var avatarOptions = subparser.addMutuallyExclusiveGroup();
         avatarOptions.addArgument("--avatar").help("Path to new profile avatar");
         avatarOptions.addArgument("--remove-avatar").action(Arguments.storeTrue());
-
-        subparser.help("Set a name, about and avatar image for the user profile");
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
-        String name = ns.getString("name");
-        String about = ns.getString("about");
-        String aboutEmoji = ns.getString("about_emoji");
-        String avatarPath = ns.getString("avatar");
-        boolean removeAvatar = ns.getBoolean("remove_avatar");
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) 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 mobileCoinAddressString = ns.getString("mobile-coin-address");
+        var mobileCoinAddress = mobileCoinAddressString == null
+                ? null
+                : Base64.getDecoder().decode(mobileCoinAddressString);
+
+        var avatarPath = ns.getString("avatar");
+        boolean removeAvatar = Boolean.TRUE.equals(ns.getBoolean("remove-avatar"));
+        String avatarFile = removeAvatar || avatarPath == null ? null : avatarPath;
 
         try {
-            Optional<File> avatarFile = removeAvatar
-                    ? Optional.absent()
-                    : avatarPath == null ? null : Optional.of(new File(avatarPath));
-            m.setProfile(name, about, aboutEmoji, avatarFile);
+            m.updateProfile(UpdateProfile.newBuilder()
+                    .withGivenName(givenName)
+                    .withFamilyName(familyName)
+                    .withAbout(about)
+                    .withAboutEmoji(aboutEmoji)
+                    .withMobileCoinAddress(mobileCoinAddress)
+                    .withAvatar(avatarFile)
+                    .withDeleteAvatar(removeAvatar)
+                    .build());
         } catch (IOException e) {
-            System.err.println("UpdateAccount error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Update profile error: " + e.getMessage(), e);
         }
-
-        return 0;
     }
 }