X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/90ec01bfbfee85acc1b3a26e741e439895781cd7..caa4fa0180a84cca10a1b363d25147d03ccb0387:/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 9a67d417..c729a39a 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateAccountCommand.java @@ -49,11 +49,15 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand { 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)); + 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); @@ -73,6 +77,7 @@ public class UpdateAccountCommand implements JsonRpcLocalCommand { } private record JsonAccountResponse( - @JsonInclude(JsonInclude.Include.NON_NULL) String username + @JsonInclude(JsonInclude.Include.NON_NULL) String username, + @JsonInclude(JsonInclude.Include.NON_NULL) String usernameLink ) {} }