import net.sourceforge.argparse4j.inf.Subparser;
import org.asamk.Signal;
-import org.asamk.signal.GroupLinkState;
-import org.asamk.signal.GroupPermission;
+import org.asamk.signal.JsonWriter;
import org.asamk.signal.OutputWriter;
-import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.PlainTextWriter;
import org.asamk.signal.commands.exceptions.CommandException;
import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
import org.asamk.signal.commands.exceptions.UserErrorException;
import org.asamk.signal.manager.AttachmentInvalidException;
import org.asamk.signal.manager.Manager;
import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupIdFormatException;
+import org.asamk.signal.manager.groups.GroupLinkState;
import org.asamk.signal.manager.groups.GroupNotFoundException;
+import org.asamk.signal.manager.groups.GroupPermission;
+import org.asamk.signal.manager.groups.GroupSendingNotAllowedException;
import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.util.CommandUtil;
import org.asamk.signal.util.ErrorUtils;
-import org.asamk.signal.util.Util;
import org.freedesktop.dbus.exceptions.DBusExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Base64;
+import java.util.HashMap;
import java.util.List;
-public class UpdateGroupCommand implements DbusCommand, LocalCommand {
+public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand {
private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
- private final OutputWriter outputWriter;
- public UpdateGroupCommand(final OutputWriter outputWriter) {
- this.outputWriter = outputWriter;
+ @Override
+ public String getName() {
+ return "updateGroup";
}
- public static void attachToSubparser(final Subparser subparser) {
+ @Override
+ public void attachToSubparser(final Subparser subparser) {
subparser.help("Create or update a group.");
- subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+ subparser.addArgument("-g", "--group-id", "--group").help("Specify the group ID.");
subparser.addArgument("-n", "--name").help("Specify the new group name.");
subparser.addArgument("-d", "--description").help("Specify the new group description.");
subparser.addArgument("-a", "--avatar").help("Specify a new group avatar image file");
.help("Reset group link and create new link password");
subparser.addArgument("--link")
.help("Set group link state, with or without admin approval")
- .type(Arguments.enumStringType(GroupLinkState.class));
+ .choices("enabled", "enabled-with-approval", "disabled");
subparser.addArgument("--set-permission-add-member")
.help("Set permission to add new group members")
- .type(Arguments.enumStringType(GroupPermission.class));
+ .choices("every-member", "only-admins");
subparser.addArgument("--set-permission-edit-details")
.help("Set permission to edit group details")
- .type(Arguments.enumStringType(GroupPermission.class));
+ .choices("every-member", "only-admins");
+ subparser.addArgument("--set-permission-send-messages")
+ .help("Set permission to send messages")
+ .choices("every-member", "only-admins");
subparser.addArgument("-e", "--expiration").type(int.class).help("Set expiration time of messages (seconds)");
}
- @Override
- public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
- final var writer = (PlainTextWriterImpl) outputWriter;
- GroupId groupId = null;
- final var groupIdString = ns.getString("group");
- if (groupIdString != null) {
- try {
- groupId = Util.decodeGroupId(groupIdString);
- } catch (GroupIdFormatException e) {
- throw new UserErrorException("Invalid group id: " + e.getMessage());
- }
+ GroupLinkState getGroupLinkState(String value) throws UserErrorException {
+ if (value == null) {
+ return null;
+ }
+ switch (value) {
+ case "enabled":
+ return GroupLinkState.ENABLED;
+ case "enabled-with-approval":
+ case "enabledWithApproval":
+ return GroupLinkState.ENABLED_WITH_APPROVAL;
+ case "disabled":
+ return GroupLinkState.DISABLED;
+ default:
+ throw new UserErrorException("Invalid group link state: " + value);
+ }
+ }
+
+ GroupPermission getGroupPermission(String value) throws UserErrorException {
+ if (value == null) {
+ return null;
+ }
+ switch (value) {
+ case "every-member":
+ case "everyMember":
+ return GroupPermission.EVERY_MEMBER;
+ case "only-admins":
+ case "onlyAdmins":
+ return GroupPermission.ONLY_ADMINS;
+ default:
+ throw new UserErrorException("Invalid group permission: " + value);
}
+ }
+
+ @Override
+ public void handleCommand(
+ final Namespace ns, final Manager m, final OutputWriter outputWriter
+ ) throws CommandException {
+ final var groupIdString = ns.getString("group-id");
+ var groupId = CommandUtil.getGroupId(groupIdString);
+
+ final var localNumber = m.getSelfNumber();
var groupName = ns.getString("name");
var groupDescription = ns.getString("description");
- var groupMembers = ns.<String>getList("member");
- var groupRemoveMembers = ns.<String>getList("remove-member");
- var groupAdmins = ns.<String>getList("admin");
- var groupRemoveAdmins = ns.<String>getList("remove-admin");
+ var groupMembers = CommandUtil.getSingleRecipientIdentifiers(ns.getList("member"), localNumber);
+ var groupRemoveMembers = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-member"), localNumber);
+ var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), localNumber);
+ var groupRemoveAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-admin"), localNumber);
var groupAvatar = ns.getString("avatar");
var groupResetLink = ns.getBoolean("reset-link");
- var groupLinkState = ns.<GroupLinkState>get("link");
+ var groupLinkState = getGroupLinkState(ns.getString("link"));
var groupExpiration = ns.getInt("expiration");
- var groupAddMemberPermission = ns.<GroupPermission>get("set-permission-add-member");
- var groupEditDetailsPermission = ns.<GroupPermission>get("set-permission-edit-details");
+ var groupAddMemberPermission = getGroupPermission(ns.getString("set-permission-add-member"));
+ var groupEditDetailsPermission = getGroupPermission(ns.getString("set-permission-edit-details"));
+ var groupSendMessagesPermission = getGroupPermission(ns.getString("set-permission-send-messages"));
try {
+ boolean isNewGroup = false;
+ Long timestamp = null;
if (groupId == null) {
+ isNewGroup = true;
var results = m.createGroup(groupName,
groupMembers,
groupAvatar == null ? null : new File(groupAvatar));
- ErrorUtils.handleTimestampAndSendMessageResults(writer, 0, results.second());
+ timestamp = results.second().getTimestamp();
+ ErrorUtils.handleSendMessageResults(results.second().getResults());
groupId = results.first();
- writer.println("Created new group: \"{}\"", groupId.toBase64());
groupName = null;
groupMembers = null;
groupAvatar = null;
groupAdmins,
groupRemoveAdmins,
groupResetLink,
- groupLinkState != null ? groupLinkState.toLinkState() : null,
- groupAddMemberPermission != null ? groupAddMemberPermission.toManager() : null,
- groupEditDetailsPermission != null ? groupEditDetailsPermission.toManager() : null,
+ groupLinkState,
+ groupAddMemberPermission,
+ groupEditDetailsPermission,
groupAvatar == null ? null : new File(groupAvatar),
- groupExpiration);
+ groupExpiration,
+ groupSendMessagesPermission == null
+ ? null
+ : groupSendMessagesPermission == GroupPermission.ONLY_ADMINS);
if (results != null) {
- ErrorUtils.handleTimestampAndSendMessageResults(writer, results.first(), results.second());
+ timestamp = results.getTimestamp();
+ ErrorUtils.handleSendMessageResults(results.getResults());
}
+ outputResult(outputWriter, timestamp, isNewGroup ? groupId : null);
} catch (AttachmentInvalidException e) {
throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
- } catch (GroupNotFoundException e) {
- logger.warn("Unknown group id: {}", groupIdString);
- } catch (NotAGroupMemberException e) {
- logger.warn("You're not a group member");
- } catch (InvalidNumberException e) {
- throw new UserErrorException("Failed to parse member number: " + e.getMessage());
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+ throw new UserErrorException(e.getMessage());
} catch (IOException e) {
- throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
+ throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+ .getSimpleName() + ")", e);
}
}
@Override
- public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
- final var writer = (PlainTextWriterImpl) outputWriter;
- byte[] groupId = null;
- if (ns.getString("group") != null) {
- try {
- groupId = Util.decodeGroupId(ns.getString("group")).serialize();
- } catch (GroupIdFormatException e) {
- throw new UserErrorException("Invalid group id: " + e.getMessage());
- }
- }
- if (groupId == null) {
- groupId = new byte[0];
- }
+ public void handleCommand(
+ final Namespace ns, final Signal signal, final OutputWriter outputWriter
+ ) throws CommandException {
+ var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
var groupName = ns.getString("name");
if (groupName == null) {
}
try {
- var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
- if (groupId.length != newGroupId.length) {
- writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId));
+ var newGroupId = signal.updateGroup(groupId == null ? new byte[0] : groupId.serialize(),
+ groupName,
+ groupMembers,
+ groupAvatar);
+ if (groupId == null) {
+ outputResult(outputWriter, null, GroupId.unknownVersion(newGroupId));
}
} catch (Signal.Error.AttachmentInvalid e) {
throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
} catch (DBusExecutionException e) {
- throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
+ throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
+ .getSimpleName() + ")", e);
+ }
+ }
+
+ private void outputResult(final OutputWriter outputWriter, final Long timestamp, final GroupId groupId) {
+ if (outputWriter instanceof PlainTextWriter) {
+ final var writer = (PlainTextWriter) outputWriter;
+ if (groupId != null) {
+ writer.println("Created new group: \"{}\"", groupId.toBase64());
+ }
+ if (timestamp != null) {
+ writer.println("{}", timestamp);
+ }
+ } else {
+ final var writer = (JsonWriter) outputWriter;
+ final var result = new HashMap<>();
+ if (timestamp != null) {
+ result.put("timestamp", timestamp);
+ }
+ if (groupId != null) {
+ result.put("groupId", groupId.toBase64());
+ }
+ writer.write(result);
}
}
}
git.nmode.ca / signal-cli / blobdiff
