X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/299671480fb79f0abcc67ec5f9ec89fac9605345..e5a67d6ce1312fe118e99b8bc8fb2f55ed1dbcf2:/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
index 600a38c4..2bb2d110 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java
@@ -1,12 +1,17 @@
 package org.asamk.signal.commands;
 
+import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.OutputWriter;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.InvalidUsernameException;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
 
 import java.io.IOException;
 
@@ -21,6 +26,11 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Update the account attributes on the signal server.");
         subparser.addArgument("-n", "--device-name").help("Specify a name to describe this device.");
+        var mut = subparser.addMutuallyExclusiveGroup();
+        mut.addArgument("-u", "--username").help("Specify a username that can then be used to contact this account.");
+        mut.addArgument("--delete-username")
+                .action(Arguments.storeTrue())
+                .help("Delete the username associated with this account.");
     }
 
     @Override
@@ -31,7 +41,36 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand {
         try {
             m.updateAccountAttributes(deviceName);
         } catch (IOException e) {
-            throw new IOErrorException("UpdateAccount error: " + e.getMessage());
+            throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e);
+        }
+
+        var username = ns.getString("username");
+        if (username != null) {
+            try {
+                final var newUsername = m.setUsername(username);
+                if (outputWriter instanceof PlainTextWriter w) {
+                    w.println("Your new username: {}", newUsername);
+                } else if (outputWriter instanceof JsonWriter w) {
+                    w.write(new JsonAccountResponse(newUsername));
+                }
+            } catch (IOException e) {
+                throw new IOErrorException("Failed to set username: " + e.getMessage(), e);
+            } catch (InvalidUsernameException e) {
+                throw new UserErrorException("Invalid username: " + e.getMessage(), e);
+            }
+        }
+
+        var deleteUsername = Boolean.TRUE.equals(ns.getBoolean("delete-username"));
+        if (deleteUsername) {
+            try {
+                m.deleteUsername();
+            } catch (IOException e) {
+                throw new IOErrorException("Failed to delete username: " + e.getMessage(), e);
+            }
         }
     }
+
+    private record JsonAccountResponse(
+            String username
+    ) {}
 }