X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/fc8b6d0fcbedd6a4c9ae394a0640e79690e28337..37c65ca6b4d86c918740de323be797bd8246ffc9:/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 7fe70213..c729a39a 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java @@ -1,12 +1,19 @@ package org.asamk.signal.commands; +import com.fasterxml.jackson.annotation.JsonInclude; + +import net.sourceforge.argparse4j.impl.Arguments; 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.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 +28,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 @@ -33,5 +45,39 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand { } catch (IOException e) { throw new IOErrorException("UpdateAccount error: " + e.getMessage(), e); } + + var username = ns.getString("username"); + if (username != null) { + try { + m.setUsername(username); + final var newUsername = m.getUsername(); + final var newUsernameLink = m.getUsernameLink(); + switch (outputWriter) { + case PlainTextWriter w -> w.println("Your new username: {} ({})", + newUsername, + newUsernameLink == null ? "-" : newUsernameLink.getUrl()); + case JsonWriter w -> w.write(new JsonAccountResponse(newUsername, + newUsernameLink == null ? null : newUsernameLink.getUrl())); + } + } 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( + @JsonInclude(JsonInclude.Include.NON_NULL) String username, + @JsonInclude(JsonInclude.Include.NON_NULL) String usernameLink + ) {} }