import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
-import org.asamk.signal.JsonWriter;
-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;
import org.asamk.signal.manager.Manager;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.LastGroupAdminException;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.LastGroupAdminException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.output.OutputWriter;
import org.asamk.signal.util.CommandUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.util.Map;
-import static org.asamk.signal.util.ErrorUtils.handleSendMessageResults;
+import static org.asamk.signal.util.SendMessageResultUtils.outputResult;
public class QuitGroupCommand implements JsonRpcLocalCommand {
- private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
+ private static final Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
@Override
public String getName() {
try {
try {
final var results = m.quitGroup(groupId, groupAdmins);
- final var timestamp = results.getTimestamp();
- outputResult(outputWriter, timestamp);
- handleSendMessageResults(results.getResults());
+ outputResult(outputWriter, results);
} catch (NotAGroupMemberException e) {
logger.info("User is not a group member");
}
- if (ns.getBoolean("delete")) {
+ if (Boolean.TRUE.equals(ns.getBoolean("delete"))) {
logger.debug("Deleting group {}", groupId);
m.deleteGroup(groupId);
}
throw new UserErrorException("Failed to send to group: " + e.getMessage());
} catch (LastGroupAdminException e) {
throw new UserErrorException("You need to specify a new admin with --admin: " + e.getMessage());
- }
- }
-
- private void outputResult(final OutputWriter outputWriter, final long timestamp) {
- if (outputWriter instanceof PlainTextWriter) {
- final var writer = (PlainTextWriter) outputWriter;
- writer.println("{}", timestamp);
- } else {
- final var writer = (JsonWriter) outputWriter;
- writer.write(Map.of("timestamp", timestamp));
+ } catch (UnregisteredRecipientException e) {
+ throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
}
}
}