mirror of
https://github.com/AsamK/signal-cli
synced 2025-08-29 18:40:39 +00:00
Add RecipientIdentifier as external Manager interface
This commit is contained in:
parent
cd7172ee57
commit
467a48bac5
25 changed files with 958 additions and 595 deletions
99
src/main/java/org/asamk/signal/util/CommandUtil.java
Normal file
99
src/main/java/org/asamk/signal/util/CommandUtil.java
Normal file
|
@ -0,0 +1,99 @@
|
|||
package org.asamk.signal.util;
|
||||
|
||||
import org.asamk.signal.commands.exceptions.UserErrorException;
|
||||
import org.asamk.signal.manager.Manager;
|
||||
import org.asamk.signal.manager.api.RecipientIdentifier;
|
||||
import org.asamk.signal.manager.groups.GroupId;
|
||||
import org.asamk.signal.manager.groups.GroupIdFormatException;
|
||||
import org.whispersystems.signalservice.api.util.InvalidNumberException;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public class CommandUtil {
|
||||
|
||||
private CommandUtil() {
|
||||
}
|
||||
|
||||
public static Set<RecipientIdentifier> getRecipientIdentifiers(
|
||||
final Manager m,
|
||||
final boolean isNoteToSelf,
|
||||
final List<String> recipientStrings,
|
||||
final List<String> groupIdStrings
|
||||
) throws UserErrorException {
|
||||
final var recipientIdentifiers = new HashSet<RecipientIdentifier>();
|
||||
if (isNoteToSelf) {
|
||||
recipientIdentifiers.add(new RecipientIdentifier.NoteToSelf());
|
||||
}
|
||||
if (recipientStrings != null) {
|
||||
final var localNumber = m.getUsername();
|
||||
recipientIdentifiers.addAll(CommandUtil.getSingleRecipientIdentifiers(recipientStrings, localNumber));
|
||||
}
|
||||
if (groupIdStrings != null) {
|
||||
recipientIdentifiers.addAll(CommandUtil.getGroupIdentifiers(groupIdStrings));
|
||||
}
|
||||
|
||||
if (recipientIdentifiers.isEmpty()) {
|
||||
throw new UserErrorException("No recipients given");
|
||||
}
|
||||
return recipientIdentifiers;
|
||||
}
|
||||
|
||||
public static Set<RecipientIdentifier.Group> getGroupIdentifiers(Collection<String> groupIdStrings) throws UserErrorException {
|
||||
if (groupIdStrings == null) {
|
||||
return Set.of();
|
||||
}
|
||||
final var groupIds = new HashSet<RecipientIdentifier.Group>();
|
||||
for (final var groupIdString : groupIdStrings) {
|
||||
groupIds.add(new RecipientIdentifier.Group(getGroupId(groupIdString)));
|
||||
}
|
||||
return groupIds;
|
||||
}
|
||||
|
||||
public static Set<GroupId> getGroupIds(Collection<String> groupIdStrings) throws UserErrorException {
|
||||
if (groupIdStrings == null) {
|
||||
return Set.of();
|
||||
}
|
||||
final var groupIds = new HashSet<GroupId>();
|
||||
for (final var groupIdString : groupIdStrings) {
|
||||
groupIds.add(getGroupId(groupIdString));
|
||||
}
|
||||
return groupIds;
|
||||
}
|
||||
|
||||
public static GroupId getGroupId(String groupId) throws UserErrorException {
|
||||
if (groupId == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return GroupId.fromBase64(groupId);
|
||||
} catch (GroupIdFormatException e) {
|
||||
throw new UserErrorException("Invalid group id: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public static Set<RecipientIdentifier.Single> getSingleRecipientIdentifiers(
|
||||
final Collection<String> recipientStrings, final String localNumber
|
||||
) throws UserErrorException {
|
||||
if (recipientStrings == null) {
|
||||
return Set.of();
|
||||
}
|
||||
final var identifiers = new HashSet<RecipientIdentifier.Single>();
|
||||
for (var recipientString : recipientStrings) {
|
||||
identifiers.add(getSingleRecipientIdentifier(recipientString, localNumber));
|
||||
}
|
||||
return identifiers;
|
||||
}
|
||||
|
||||
public static RecipientIdentifier.Single getSingleRecipientIdentifier(
|
||||
final String recipientString, final String localNumber
|
||||
) throws UserErrorException {
|
||||
try {
|
||||
return RecipientIdentifier.Single.fromString(recipientString, localNumber);
|
||||
} catch (InvalidNumberException e) {
|
||||
throw new UserErrorException("Invalid phone number '" + recipientString + "': " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue