webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement JsonRpc command for quitGroup

Browse source
This commit is contained in:
AsamK 2021-08-10 16:13:08 +02:00
parent 7b809c6547
commit b24fa98e3c
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/org/asamk/signal/commands/QuitGroupCommand.java
View file

@ -4,6 +4,7 @@ import net.sourceforge.argparse4j.impl.Arguments;
import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser; import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.signal.JsonWriter;
import org.asamk.signal.OutputWriter; import org.asamk.signal.OutputWriter;
import org.asamk.signal.PlainTextWriter; import org.asamk.signal.PlainTextWriter;
import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.CommandException;
@ -22,11 +23,12 @@ import org.whispersystems.signalservice.api.util.InvalidNumberException;
import java.io.IOException; import java.io.IOException;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import java.util.Set; import java.util.Set;
import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults; import static org.asamk.signal.util.ErrorUtils.handleSendMessageResults;
public class QuitGroupCommand implements LocalCommand { public class QuitGroupCommand implements JsonRpcLocalCommand {
private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class); private final static Logger logger = LoggerFactory.getLogger(QuitGroupCommand.class);
private final OutputWriter outputWriter; private final OutputWriter outputWriter;
@ -48,8 +50,6 @@ public class QuitGroupCommand implements LocalCommand {
@Override @Override
public void handleCommand(final Namespace ns, final Manager m) throws CommandException { public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
final var writer = (PlainTextWriter) outputWriter;
final GroupId groupId; final GroupId groupId;
try { try {
groupId = Util.decodeGroupId(ns.getString("group-id")); groupId = Util.decodeGroupId(ns.getString("group-id"));
@ -64,8 +64,8 @@ public class QuitGroupCommand implements LocalCommand {
final var results = m.sendQuitGroupMessage(groupId, final var results = m.sendQuitGroupMessage(groupId,
groupAdmins == null ? Set.of() : new HashSet<>(groupAdmins)); groupAdmins == null ? Set.of() : new HashSet<>(groupAdmins));
final var timestamp = results.first(); final var timestamp = results.first();
writer.println("{}", timestamp); outputResult(timestamp);
handleTimestampAndSendMessageResults(results.second()); handleSendMessageResults(results.second());
} catch (NotAGroupMemberException e) { } catch (NotAGroupMemberException e) {
logger.info("User is not a group member"); logger.info("User is not a group member");
} }
@ -83,4 +83,14 @@ public class QuitGroupCommand implements LocalCommand {
throw new UserErrorException("You need to specify a new admin with --admin: " + e.getMessage()); throw new UserErrorException("You need to specify a new admin with --admin: " + e.getMessage());
} }
} }
private void outputResult(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));
}
}
} }