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

Handle both handleCommands

Browse source
This commit is contained in:
technillogue 2021-07-24 18:21:58 -04:00
parent 97138387d1
commit 0e393c0b0d
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,10 +5,10 @@ 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.JsonWriter;
import org.asamk.signal.OutputType;
import org.asamk.signal.PlainTextWriterImpl; import org.asamk.signal.PlainTextWriterImpl;
import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.UnexpectedErrorException; import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
@ -71,6 +71,11 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)"); subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
} }
@Override
public Set<OutputType> getSupportedOutputTypes() {
return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
}
@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 = new PlainTextWriterImpl(System.out); final var writer = new PlainTextWriterImpl(System.out);
@ -104,7 +109,12 @@ public class UpdateGroupCommand implements DbusCommand, LocalCommand {
groupAvatar == null ? null : new File(groupAvatar)); groupAvatar == null ? null : new File(groupAvatar));
ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second()); ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second());
groupId = results.first(); groupId = results.first();
writer.println("Created new group: \"{}\"", groupId.toBase64()); if (ns.get("output") == OutputType.JSON) {
final var jsonWriter = new JsonWriter(System.out);
jsonWriter.write(Map.of("groupId", groupId.toBase64(), "members", groupMembers, "name", groupName));
} else {
writer.println("Created new group: \"{}\"", groupId.toBase64());
}
groupName = null; groupName = null;
groupMembers = null; groupMembers = null;
groupAvatar = null; groupAvatar = null;
@ -139,11 +149,6 @@ 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);
@ -177,12 +182,12 @@ 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) {
String encodedGroup = Base64.getEncoder().encodeToString(newGroupId); String encodedGroupId = Base64.getEncoder().encodeToString(newGroupId);
if (ns.get("output") == OutputType.JSON) { if (ns.get("output") == OutputType.JSON) {
final var jsonWriter = new JsonWriter(System.out); final var jsonWriter = new JsonWriter(System.out);
jsonWriter.write(Map.of("group", encodedGroup, "members", groupMembers, "name", groupName)); jsonWriter.write(Map.of("groupId", encodedGroupId, "members", groupMembers, "name", groupName));
} else { } else {
writer.println("Created new group: \"{}\"", encodedGroup); writer.println("Created new group: \"{}\"", encodedGroupId);
} }
} }
} catch (Signal.Error.AttachmentInvalid e) { } catch (Signal.Error.AttachmentInvalid e) {