import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
-import org.asamk.Signal;
-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.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.GroupLinkState;
-import org.asamk.signal.manager.groups.GroupNotFoundException;
-import org.asamk.signal.manager.groups.GroupPermission;
-import org.asamk.signal.manager.groups.NotAGroupMemberException;
+import org.asamk.signal.manager.api.AttachmentInvalidException;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.GroupLinkState;
+import org.asamk.signal.manager.api.GroupNotFoundException;
+import org.asamk.signal.manager.api.GroupPermission;
+import org.asamk.signal.manager.api.GroupSendingNotAllowedException;
+import org.asamk.signal.manager.api.NotAGroupMemberException;
+import org.asamk.signal.manager.api.SendGroupMessageResults;
+import org.asamk.signal.manager.api.UnregisteredRecipientException;
+import org.asamk.signal.manager.api.UpdateGroup;
+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;
import org.asamk.signal.util.CommandUtil;
-import org.asamk.signal.util.ErrorUtils;
-import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.asamk.signal.util.SendMessageResultUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
+import java.util.stream.Stream;
-public class UpdateGroupCommand implements DbusCommand, JsonRpcLocalCommand {
+public class UpdateGroupCommand implements JsonRpcLocalCommand {
- private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+ private static final Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
@Override
public String getName() {
subparser.addArgument("--remove-admin")
.nargs("*")
.help("Specify one or more members to remove group admin privileges");
+ subparser.addArgument("--ban").nargs("*").help("Specify one or more members to ban from joining the group");
+ subparser.addArgument("--unban").nargs("*").help("Specify one or more members to remove from the ban list");
subparser.addArgument("--reset-link")
.action(Arguments.storeTrue())
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);
- }
+ return switch (value) {
+ case "enabled" -> GroupLinkState.ENABLED;
+ case "enabled-with-approval", "enabledWithApproval" -> GroupLinkState.ENABLED_WITH_APPROVAL;
+ case "disabled" -> 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);
- }
+ return switch (value) {
+ case "every-member", "everyMember" -> GroupPermission.EVERY_MEMBER;
+ case "only-admins", "onlyAdmins" -> GroupPermission.ONLY_ADMINS;
+ default -> throw new UserErrorException("Invalid group permission: " + value);
+ };
}
@Override
public void handleCommand(
- final Namespace ns, final Manager m, final OutputWriter outputWriter
+ 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.getUsername();
+ final var localNumber = m.getSelfNumber();
var groupName = ns.getString("name");
var groupDescription = ns.getString("description");
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 groupBan = CommandUtil.getSingleRecipientIdentifiers(ns.getList("ban"), localNumber);
+ var groupUnban = CommandUtil.getSingleRecipientIdentifiers(ns.getList("unban"), localNumber);
var groupAvatar = ns.getString("avatar");
- var groupResetLink = ns.getBoolean("reset-link");
+ var groupResetLink = Boolean.TRUE.equals(ns.getBoolean("reset-link"));
var groupLinkState = getGroupLinkState(ns.getString("link"));
var groupExpiration = ns.getInt("expiration");
var groupAddMemberPermission = getGroupPermission(ns.getString("set-permission-add-member"));
try {
boolean isNewGroup = false;
- Long timestamp = null;
+ SendGroupMessageResults groupMessageResults = null;
if (groupId == null) {
isNewGroup = true;
- var results = m.createGroup(groupName,
- groupMembers,
- groupAvatar == null ? null : new File(groupAvatar));
- timestamp = results.second().getTimestamp();
- ErrorUtils.handleSendMessageResults(results.second().getResults());
+ var results = m.createGroup(groupName, groupMembers, groupAvatar);
+ groupMessageResults = results.second();
groupId = results.first();
groupName = null;
groupMembers = null;
}
var results = m.updateGroup(groupId,
- groupName,
- groupDescription,
- groupMembers,
- groupRemoveMembers,
- groupAdmins,
- groupRemoveAdmins,
- groupResetLink,
- groupLinkState,
- groupAddMemberPermission,
- groupEditDetailsPermission,
- groupAvatar == null ? null : new File(groupAvatar),
- groupExpiration,
- groupSendMessagesPermission == null
- ? null
- : groupSendMessagesPermission == GroupPermission.ONLY_ADMINS);
+ UpdateGroup.newBuilder()
+ .withName(groupName)
+ .withDescription(groupDescription)
+ .withMembers(groupMembers)
+ .withRemoveMembers(groupRemoveMembers)
+ .withAdmins(groupAdmins)
+ .withRemoveAdmins(groupRemoveAdmins)
+ .withBanMembers(groupBan)
+ .withUnbanMembers(groupUnban)
+ .withResetGroupLink(groupResetLink)
+ .withGroupLinkState(groupLinkState)
+ .withAddMemberPermission(groupAddMemberPermission)
+ .withEditDetailsPermission(groupEditDetailsPermission)
+ .withAvatarFile(groupAvatar)
+ .withExpirationTimer(groupExpiration)
+ .withIsAnnouncementGroup(groupSendMessagesPermission == null
+ ? null
+ : groupSendMessagesPermission == GroupPermission.ONLY_ADMINS)
+ .build());
if (results != null) {
- timestamp = results.getTimestamp();
- ErrorUtils.handleSendMessageResults(results.getResults());
+ if (groupMessageResults == null) {
+ groupMessageResults = results;
+ } else {
+ groupMessageResults = new SendGroupMessageResults(results.timestamp(),
+ Stream.concat(groupMessageResults.results().stream(), results.results().stream()).toList());
+ }
}
- outputResult(outputWriter, timestamp, isNewGroup ? groupId : null);
+ outputResult(outputWriter, groupMessageResults, isNewGroup ? groupId : null);
} catch (AttachmentInvalidException e) {
throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
- } catch (GroupNotFoundException | NotAGroupMemberException e) {
+ } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
throw new UserErrorException(e.getMessage());
+ } catch (UnregisteredRecipientException e) {
+ throw new UserErrorException("The user " + e.getSender().getIdentifier() + " is not registered.");
} 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, final OutputWriter outputWriter
- ) throws CommandException {
- var groupId = CommandUtil.getGroupId(ns.getString("group-id"));
-
- var groupName = ns.getString("name");
- if (groupName == null) {
- groupName = "";
- }
-
- List<String> groupMembers = ns.getList("member");
- if (groupMembers == null) {
- groupMembers = new ArrayList<>();
- }
-
- var groupAvatar = ns.getString("avatar");
- if (groupAvatar == null) {
- groupAvatar = "";
- }
-
- try {
- 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());
- }
- }
-
- 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);
+ private void outputResult(
+ final OutputWriter outputWriter,
+ final SendGroupMessageResults results,
+ final GroupId groupId
+ ) {
+ switch (outputWriter) {
+ case PlainTextWriter writer -> {
+ if (groupId != null) {
+ writer.println("Created new group: \"{}\"", groupId.toBase64());
+ }
+ if (results != null) {
+ var errors = SendMessageResultUtils.getErrorMessagesFromSendMessageResults(results.results());
+ SendMessageResultUtils.printSendMessageResultErrors(writer, errors);
+ writer.println("{}", results.timestamp());
+ }
}
- if (groupId != null) {
- result.put("groupId", groupId.toBase64());
+ case JsonWriter writer -> {
+ final var response = new HashMap<>();
+ if (results != null) {
+ response.put("timestamp", results.timestamp());
+ var jsonResults = SendMessageResultUtils.getJsonSendMessageResults(results.results());
+ response.put("results", jsonResults);
+ }
+ if (groupId != null) {
+ response.put("groupId", groupId.toBase64());
+ }
+ writer.write(response);
}
- writer.write(result);
}
}
}
git.nmode.ca / signal-cli / blobdiff
