Implement configuration handling

[signal-cli] / 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 8c1b9fb25764c96f54dafe6b1450e78f498a43fe..1e06ea9ce9d3ca349cb76f4e0136b1e74f455876 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/JoinGroupCommand.java
@@ -57,14 +57,14 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
             var newGroupId = results.first();
             if (outputWriter instanceof JsonWriter) {
                 final var writer = (JsonWriter) outputWriter;
-                if (!m.getGroup(newGroupId).isMember(m.getSelfRecipientId())) {
+                if (!m.getGroup(newGroupId).isMember()) {
                     writer.write(Map.of("groupId", newGroupId.toBase64(), "onlyRequested", true));
                 } else {
                     writer.write(Map.of("groupId", newGroupId.toBase64()));
                 }
             } else {
                 final var writer = (PlainTextWriter) outputWriter;
-                if (!m.getGroup(newGroupId).isMember(m.getSelfRecipientId())) {
+                if (!m.getGroup(newGroupId).isMember()) {
                     writer.println("Requested to join group \"{}\"", newGroupId.toBase64());
                 } else {
                     writer.println("Joined group \"{}\"", newGroupId.toBase64());
@@ -78,10 +78,10 @@ public class JoinGroupCommand implements JsonRpcLocalCommand {
                     + e.getMessage()
                     + " ("
                     + e.getClass().getSimpleName()
-                    + ")");
+                    + ")", e);
         } catch (DBusExecutionException e) {
             throw new UnexpectedErrorException("Failed to send message: " + e.getMessage() + " (" + e.getClass()
-                    .getSimpleName() + ")");
+                    .getSimpleName() + ")", e);
         } catch (GroupLinkNotActiveException e) {
             throw new UserErrorException("Group link is not valid: " + e.getMessage());
         }