webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-04 05:00:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add JSON output

Browse source
This commit is contained in:
technillogue 2021-07-23 18:04:52 -04:00
parent dedbafb99a
commit 97138387d1
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
View file

@ -5,6 +5,8 @@ import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser; import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.Signal; import org.asamk.Signal;
import org.asamk.signal.JsonWriter;
import org.asamk.signal.OutputType;
import org.asamk.signal.GroupLinkState; import org.asamk.signal.GroupLinkState;
import org.asamk.signal.GroupPermission; import org.asamk.signal.GroupPermission;
import org.asamk.signal.PlainTextWriterImpl; import org.asamk.signal.PlainTextWriterImpl;
@ -29,6 +31,8 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Base64; import java.util.Base64;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set;
public class UpdateGroupCommand implements DbusCommand, LocalCommand { public class UpdateGroupCommand implements DbusCommand, LocalCommand {
@ -135,6 +139,11 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
} }
} }
@Override
public Set<OutputType> getSupportedOutputTypes() {
return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
}
@Override @Override
public void handleCommand(final Namespace ns, final Signal signal) throws CommandException { public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
final var writer = new PlainTextWriterImpl(System.out); final var writer = new PlainTextWriterImpl(System.out);
@ -168,7 +177,13 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
try { try {
var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar); var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
if (groupId.length != newGroupId.length) { if (groupId.length != newGroupId.length) {
writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId)); String encodedGroup = Base64.getEncoder().encodeToString(newGroupId);
if (ns.get("output") == OutputType.JSON) {
final var jsonWriter = new JsonWriter(System.out);
jsonWriter.write(Map.of("group", encodedGroup, "members", groupMembers, "name", groupName));
} else {
writer.println("Created new group: \"{}\"", encodedGroup);
}
} }
} catch (Signal.Error.AttachmentInvalid e) { } catch (Signal.Error.AttachmentInvalid e) {
throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage()); throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());