X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/87406e2cdb4cb65a50202792350657457801c235..a8bbdb54d006f157a009ece0cae5bf72fb636ced:/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java diff --git a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java index 0a53c638..cb98e15a 100644 --- a/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/QuitGroupCommand.java @@ -4,7 +4,8 @@ import net.sourceforge.argparse4j.impl.Arguments; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; -import org.asamk.signal.PlainTextWriterImpl; +import org.asamk.signal.OutputWriter; +import org.asamk.signal.PlainTextWriter; import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; @@ -28,11 +29,15 @@ import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResu public class QuitGroupCommand implements LocalCommand { private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class); + private final OutputWriter outputWriter; - @Override - public void attachToSubparser(final Subparser subparser) { + public QuitGroupCommand(final OutputWriter outputWriter) { + this.outputWriter = outputWriter; + } + + public static void attachToSubparser(final Subparser subparser) { subparser.help("Send a quit group message to all group members and remove self from member list."); - subparser.addArgument("-g", "--group").required(true).help("Specify the recipient group ID."); + subparser.addArgument("-g", "--group-id", "--group").required(true).help("Specify the recipient group ID."); subparser.addArgument("--delete") .action(Arguments.storeTrue()) .help("Delete local group data completely after quitting group."); @@ -43,11 +48,11 @@ public class QuitGroupCommand implements LocalCommand { @Override public void handleCommand(final Namespace ns, final Manager m) throws CommandException { - final var writer = new PlainTextWriterImpl(System.out); + final var writer = (PlainTextWriter) outputWriter; final GroupId groupId; try { - groupId = Util.decodeGroupId(ns.getString("group")); + groupId = Util.decodeGroupId(ns.getString("group-id")); } catch (GroupIdFormatException e) { throw new UserErrorException("Invalid group id: " + e.getMessage()); }