X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/221d937eecca5c9b09a3bee7df812203b9927a56..81ee2c2d2bb80660d85cf9d1b7ecdf001983b3d6:/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java diff --git a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java index e59ecec6..1fc38c7b 100644 --- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java +++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java @@ -16,7 +16,6 @@ import org.whispersystems.signalservice.internal.push.exceptions.GroupPatchNotAc import java.io.IOException; -import static org.asamk.signal.util.ErrorUtils.handleAssertionError; import static org.asamk.signal.util.ErrorUtils.handleTimestampAndSendMessageResults; public class JoinGroupCommand implements LocalCommand { @@ -47,15 +46,12 @@ public class JoinGroupCommand implements LocalCommand { final var results = m.joinGroup(linkUrl); var newGroupId = results.first(); - if (!m.getGroup(newGroupId).isMember(m.getSelfAddress())) { + if (!m.getGroup(newGroupId).isMember(m.getSelfRecipientId())) { writer.println("Requested to join group \"{}\"", newGroupId.toBase64()); } else { writer.println("Joined group \"{}\"", newGroupId.toBase64()); } handleTimestampAndSendMessageResults(writer, 0, results.second()); - } catch (AssertionError e) { - handleAssertionError(e); - throw e; } catch (GroupPatchNotAcceptedException e) { throw new UserErrorException("Failed to join group, maybe already a member"); } catch (IOException e) {