Added new parameter to filter the output of listGroups by groupId

Fixes #953

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 7bbdbf323da454ecf442f0e935a7708650346cde..4fdd684a86e361a6b67b24fcfc3d780876ee3e26 100644 (file)
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -413,6 +413,9 @@ In json mode this is outputted as an list of objects and is always in detailed m
 *-d*, *--detailed*::
 Include the list of members of each group and the group invite link.
 
 *-d*, *--detailed*::
 Include the list of members of each group and the group invite link.
 

+*-g*, *--group-id*::
+Filter the group list by one or more group IDs.
+

 === listContacts
 
 Show a list of known contacts with names.
 === listContacts
 
 Show a list of known contacts with names.

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index 80e583af7318bec1f8b6af95e12901b007cef46c..c08571f7e599d35ba2a5272e034a9ae6aed3ed73 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -11,6 +11,7 @@ import org.asamk.signal.manager.storage.recipients.RecipientAddress;
 import org.asamk.signal.output.JsonWriter;
 import org.asamk.signal.output.OutputWriter;
 import org.asamk.signal.output.PlainTextWriter;
 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 


@@ -33,6 +34,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
         subparser.addArgument("-d", "--detailed")
                 .action(Arguments.storeTrue())
                 .help("List the members and group invite links of each group. If output=json, then this is always set");
         subparser.addArgument("-d", "--detailed")
                 .action(Arguments.storeTrue())
                 .help("List the members and group invite links of each group. If output=json, then this is always set");

+        subparser.addArgument("-g", "--group-id").help("Specify one or more group IDs to show.").nargs("*");

     }
 
     private static Set<String> resolveMembers(Set<RecipientAddress> addresses) {
     }
 
     private static Set<String> resolveMembers(Set<RecipientAddress> addresses) {


@@ -79,7 +81,13 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {

-        final var groups = m.getGroups();
+        var groups = m.getGroups();
+
+        final var groupIdStrings = ns.<String>getList("group-id");
+        final var groupIds = CommandUtil.getGroupIds(groupIdStrings);
+        if (groupIds.size() > 0) {
+            groups = groups.stream().filter(g -> groupIds.contains(g.groupId())).toList();
+        }

 
         if (outputWriter instanceof JsonWriter jsonWriter) {
 
 
         if (outputWriter instanceof JsonWriter jsonWriter) {