X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/06e93b84da2718c31111e820cd35a3354f22bae2..404063a080a1a8784a1111304cc6b90b58362923:/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java index f4f2db0b..36a35b75 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java @@ -10,6 +10,7 @@ import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.AttachmentInvalidException; import org.asamk.signal.manager.Manager; 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.manager.groups.GroupId; import org.asamk.signal.manager.groups.GroupLinkState; @@ -28,7 +29,6 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; import java.util.HashMap; -import java.util.stream.Collectors; import java.util.stream.Stream; public class UpdateGroupCommand implements JsonRpcLocalCommand { @@ -160,8 +160,7 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { groupMessageResults = results; } else { groupMessageResults = new SendGroupMessageResults(results.timestamp(), - Stream.concat(groupMessageResults.results().stream(), results.results().stream()) - .collect(Collectors.toList())); + Stream.concat(groupMessageResults.results().stream(), results.results().stream()).toList()); } } outputResult(outputWriter, groupMessageResults, isNewGroup ? groupId : null); @@ -169,6 +168,8 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand { throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage()); } 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() + " (" + e.getClass() .getSimpleName() + ")", e);