Add support for banning/unbanning group members

diff --git a/client/src/cli.rs b/client/src/cli.rs
index bc6a3079f8ae3caa0c6269f6881e1d2325d3a0d5..a8cee165f82877e06bb48de9f76afacd275168f3 100644 (file)
--- a/client/src/cli.rs
+++ b/client/src/cli.rs
@@ -268,6 +268,12 @@ pub enum CliCommands {
         #[clap(long = "remove-admin")]
         remove_admin: Vec<String>,
 
         #[clap(long = "remove-admin")]
         remove_admin: Vec<String>,
 

+        #[clap(long)]
+        ban: Vec<String>,
+
+        #[clap(long)]
+        unban: Vec<String>,
+

         #[clap(long = "reset-link")]
         reset_link: bool,
 
         #[clap(long = "reset-link")]
         reset_link: bool,
 

diff --git a/client/src/jsonrpc.rs b/client/src/jsonrpc.rs
index c0feddd0a1ae8f3c26c3a84f3a13f49630642e4c..d4ed408413efe3cc6c572f6af6129ac9fdd76e89 100644 (file)
--- a/client/src/jsonrpc.rs
+++ b/client/src/jsonrpc.rs
@@ -227,6 +227,8 @@ pub trait Rpc {
         #[allow(non_snake_case)] removeMember: Vec<String>,
         admin: Vec<String>,
         #[allow(non_snake_case)] removeAdmin: Vec<String>,
         #[allow(non_snake_case)] removeMember: Vec<String>,
         admin: Vec<String>,
         #[allow(non_snake_case)] removeAdmin: Vec<String>,

+        ban: Vec<String>,
+        unban: Vec<String>,

         #[allow(non_snake_case)] resetLink: bool,
         #[allow(non_snake_case)] link: Option<String>,
         #[allow(non_snake_case)] setPermissionAddMember: Option<String>,
         #[allow(non_snake_case)] resetLink: bool,
         #[allow(non_snake_case)] link: Option<String>,
         #[allow(non_snake_case)] setPermissionAddMember: Option<String>,

diff --git a/client/src/main.rs b/client/src/main.rs
index 1ad8dbcfffffafbe21cdec9badac240f0ec5783c..6266d224da3c642b061d668c110a2749366bfcd4 100644 (file)
--- a/client/src/main.rs
+++ b/client/src/main.rs
@@ -243,6 +243,8 @@ async fn main() -> Result<(), anyhow::Error> {
             remove_member,
             admin,
             remove_admin,
             remove_member,
             admin,
             remove_admin,

+            ban,
+            unban,

             reset_link,
             link,
             set_permission_add_member,
             reset_link,
             link,
             set_permission_add_member,


@@ -261,6 +263,8 @@ async fn main() -> Result<(), anyhow::Error> {
                     remove_member,
                     admin,
                     remove_admin,
                     remove_member,
                     admin,
                     remove_admin,

+                    ban,
+                    unban,

                     reset_link,
                     link.map(|link| match link {
                         LinkState::Enabled => "enabled".to_owned(),
                     reset_link,
                     link.map(|link| match link {
                         LinkState::Enabled => "enabled".to_owned(),

diff --git a/graalvm-config-dir/reflect-config.json b/graalvm-config-dir/reflect-config.json
index 98492ef8e1e59ff0f1c93d21500c79b39f3be834..53f611b07aa43932c68ca226b8d16e0e600f1a3b 100644 (file)
--- a/graalvm-config-dir/reflect-config.json
+++ b/graalvm-config-dir/reflect-config.json
@@ -2057,6 +2057,12 @@
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true
 },
   "queryAllDeclaredMethods":true,
   "queryAllDeclaredConstructors":true
 },

+{
+  "name":"org.whispersystems.signalservice.api.push.ServiceId",
+  "allDeclaredFields":true,
+  "queryAllDeclaredMethods":true,
+  "queryAllDeclaredConstructors":true
+},

 {
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity",
   "allDeclaredFields":true,
 {
   "name":"org.whispersystems.signalservice.api.push.SignedPreKeyEntity",
   "allDeclaredFields":true,

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 45ec09f96fa5ef407f5604d8429f8ce64ee4d38b..addc3bb7f1cd8faf76b341611494235236698257 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -386,6 +386,12 @@ class ManagerImpl implements Manager {
                         updateGroup.getRemoveAdmins() == null
                                 ? null
                                 : context.getRecipientHelper().resolveRecipients(updateGroup.getRemoveAdmins()),
                         updateGroup.getRemoveAdmins() == null
                                 ? null
                                 : context.getRecipientHelper().resolveRecipients(updateGroup.getRemoveAdmins()),

+                        updateGroup.getBanMembers() == null
+                                ? null
+                                : context.getRecipientHelper().resolveRecipients(updateGroup.getBanMembers()),
+                        updateGroup.getUnbanMembers() == null
+                                ? null
+                                : context.getRecipientHelper().resolveRecipients(updateGroup.getUnbanMembers()),

                         updateGroup.isResetGroupLink(),
                         updateGroup.getGroupLinkState(),
                         updateGroup.getAddMemberPermission(),
                         updateGroup.isResetGroupLink(),
                         updateGroup.getGroupLinkState(),
                         updateGroup.getAddMemberPermission(),

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Group.java b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
index a8dfdff144af5b09baf788b8dc8c59d2bbd5568e..9b2d988a99e6b78bbe875e113935fc2a1b91d7bd 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/Group.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Group.java
@@ -20,6 +20,7 @@ public record Group(
         Set<RecipientAddress> pendingMembers,
         Set<RecipientAddress> requestingMembers,
         Set<RecipientAddress> adminMembers,
         Set<RecipientAddress> pendingMembers,
         Set<RecipientAddress> requestingMembers,
         Set<RecipientAddress> adminMembers,

+        Set<RecipientAddress> bannedMembers,

         boolean isBlocked,
         int messageExpirationTimer,
         GroupPermission permissionAddMember,
         boolean isBlocked,
         int messageExpirationTimer,
         GroupPermission permissionAddMember,


@@ -52,6 +53,10 @@ public record Group(
                         .stream()
                         .map(recipientStore::resolveRecipientAddress)
                         .collect(Collectors.toSet()),
                         .stream()
                         .map(recipientStore::resolveRecipientAddress)
                         .collect(Collectors.toSet()),

+                groupInfo.getBannedMembers()
+                        .stream()
+                        .map(recipientStore::resolveRecipientAddress)
+                        .collect(Collectors.toSet()),

                 groupInfo.isBlocked(),
                 groupInfo.getMessageExpirationTimer(),
                 groupInfo.getPermissionAddMember(),
                 groupInfo.isBlocked(),
                 groupInfo.getMessageExpirationTimer(),
                 groupInfo.getPermissionAddMember(),

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
index b5877ae5ed65e1cbda4e9f58418e5e811fcb165e..077542e16b093589931b11e74d8f77e3213cfc8f 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/UpdateGroup.java
@@ -14,6 +14,8 @@ public class UpdateGroup {
     private final Set<RecipientIdentifier.Single> removeMembers;
     private final Set<RecipientIdentifier.Single> admins;
     private final Set<RecipientIdentifier.Single> removeAdmins;
     private final Set<RecipientIdentifier.Single> removeMembers;
     private final Set<RecipientIdentifier.Single> admins;
     private final Set<RecipientIdentifier.Single> removeAdmins;

+    private final Set<RecipientIdentifier.Single> banMembers;
+    private final Set<RecipientIdentifier.Single> unbanMembers;

     private final boolean resetGroupLink;
     private final GroupLinkState groupLinkState;
     private final GroupPermission addMemberPermission;
     private final boolean resetGroupLink;
     private final GroupLinkState groupLinkState;
     private final GroupPermission addMemberPermission;


@@ -29,6 +31,8 @@ public class UpdateGroup {
         removeMembers = builder.removeMembers;
         admins = builder.admins;
         removeAdmins = builder.removeAdmins;
         removeMembers = builder.removeMembers;
         admins = builder.admins;
         removeAdmins = builder.removeAdmins;

+        banMembers = builder.banMembers;
+        unbanMembers = builder.unbanMembers;

         resetGroupLink = builder.resetGroupLink;
         groupLinkState = builder.groupLinkState;
         addMemberPermission = builder.addMemberPermission;
         resetGroupLink = builder.resetGroupLink;
         groupLinkState = builder.groupLinkState;
         addMemberPermission = builder.addMemberPermission;


@@ -43,23 +47,58 @@ public class UpdateGroup {
     }
 
     public static Builder newBuilder(final UpdateGroup copy) {
     }
 
     public static Builder newBuilder(final UpdateGroup copy) {

-        Builder builder = new Builder();
-        builder.name = copy.getName();
-        builder.description = copy.getDescription();
-        builder.members = copy.getMembers();
-        builder.removeMembers = copy.getRemoveMembers();
-        builder.admins = copy.getAdmins();
-        builder.removeAdmins = copy.getRemoveAdmins();
-        builder.resetGroupLink = copy.isResetGroupLink();
-        builder.groupLinkState = copy.getGroupLinkState();
-        builder.addMemberPermission = copy.getAddMemberPermission();
-        builder.editDetailsPermission = copy.getEditDetailsPermission();
-        builder.avatarFile = copy.getAvatarFile();
-        builder.expirationTimer = copy.getExpirationTimer();
-        builder.isAnnouncementGroup = copy.getIsAnnouncementGroup();
+        Builder builder = new Builder(copy.name,
+                copy.description,
+                copy.members,
+                copy.removeMembers,
+                copy.admins,
+                copy.removeAdmins,
+                copy.banMembers,
+                copy.unbanMembers,
+                copy.resetGroupLink,
+                copy.groupLinkState,
+                copy.addMemberPermission,
+                copy.editDetailsPermission,
+                copy.avatarFile,
+                copy.expirationTimer,
+                copy.isAnnouncementGroup);

         return builder;
     }
 
         return builder;
     }
 

+    public static Builder newBuilder(
+            final String name,
+            final String description,
+            final Set<RecipientIdentifier.Single> members,
+            final Set<RecipientIdentifier.Single> removeMembers,
+            final Set<RecipientIdentifier.Single> admins,
+            final Set<RecipientIdentifier.Single> removeAdmins,
+            final Set<RecipientIdentifier.Single> banMembers,
+            final Set<RecipientIdentifier.Single> unbanMembers,
+            final boolean resetGroupLink,
+            final GroupLinkState groupLinkState,
+            final GroupPermission addMemberPermission,
+            final GroupPermission editDetailsPermission,
+            final File avatarFile,
+            final Integer expirationTimer,
+            final Boolean isAnnouncementGroup
+    ) {
+        return new Builder(name,
+                description,
+                members,
+                removeMembers,
+                admins,
+                removeAdmins,
+                banMembers,
+                unbanMembers,
+                resetGroupLink,
+                groupLinkState,
+                addMemberPermission,
+                editDetailsPermission,
+                avatarFile,
+                expirationTimer,
+                isAnnouncementGroup);
+    }
+

     public String getName() {
         return name;
     }
     public String getName() {
         return name;
     }


@@ -84,6 +123,14 @@ public class UpdateGroup {
         return removeAdmins;
     }
 
         return removeAdmins;
     }
 

+    public Set<RecipientIdentifier.Single> getBanMembers() {
+        return banMembers;
+    }
+
+    public Set<RecipientIdentifier.Single> getUnbanMembers() {
+        return unbanMembers;
+    }
+

     public boolean isResetGroupLink() {
         return resetGroupLink;
     }
     public boolean isResetGroupLink() {
         return resetGroupLink;
     }


@@ -120,6 +167,8 @@ public class UpdateGroup {
         private Set<RecipientIdentifier.Single> removeMembers;
         private Set<RecipientIdentifier.Single> admins;
         private Set<RecipientIdentifier.Single> removeAdmins;
         private Set<RecipientIdentifier.Single> removeMembers;
         private Set<RecipientIdentifier.Single> admins;
         private Set<RecipientIdentifier.Single> removeAdmins;

+        private Set<RecipientIdentifier.Single> banMembers;
+        private Set<RecipientIdentifier.Single> unbanMembers;

         private boolean resetGroupLink;
         private GroupLinkState groupLinkState;
         private GroupPermission addMemberPermission;
         private boolean resetGroupLink;
         private GroupLinkState groupLinkState;
         private GroupPermission addMemberPermission;


@@ -131,6 +180,40 @@ public class UpdateGroup {
         private Builder() {
         }
 
         private Builder() {
         }
 

+        private Builder(
+                final String name,
+                final String description,
+                final Set<RecipientIdentifier.Single> members,
+                final Set<RecipientIdentifier.Single> removeMembers,
+                final Set<RecipientIdentifier.Single> admins,
+                final Set<RecipientIdentifier.Single> removeAdmins,
+                final Set<RecipientIdentifier.Single> banMembers,
+                final Set<RecipientIdentifier.Single> unbanMembers,
+                final boolean resetGroupLink,
+                final GroupLinkState groupLinkState,
+                final GroupPermission addMemberPermission,
+                final GroupPermission editDetailsPermission,
+                final File avatarFile,
+                final Integer expirationTimer,
+                final Boolean isAnnouncementGroup
+        ) {
+            this.name = name;
+            this.description = description;
+            this.members = members;
+            this.removeMembers = removeMembers;
+            this.admins = admins;
+            this.removeAdmins = removeAdmins;
+            this.banMembers = banMembers;
+            this.unbanMembers = unbanMembers;
+            this.resetGroupLink = resetGroupLink;
+            this.groupLinkState = groupLinkState;
+            this.addMemberPermission = addMemberPermission;
+            this.editDetailsPermission = editDetailsPermission;
+            this.avatarFile = avatarFile;
+            this.expirationTimer = expirationTimer;
+            this.isAnnouncementGroup = isAnnouncementGroup;
+        }
+

         public Builder withName(final String val) {
             name = val;
             return this;
         public Builder withName(final String val) {
             name = val;
             return this;


@@ -161,6 +244,16 @@ public class UpdateGroup {
             return this;
         }
 
             return this;
         }
 

+        public Builder withBanMembers(final Set<RecipientIdentifier.Single> val) {
+            banMembers = val;
+            return this;
+        }
+
+        public Builder withUnbanMembers(final Set<RecipientIdentifier.Single> val) {
+            unbanMembers = val;
+            return this;
+        }
+

         public Builder withResetGroupLink(final boolean val) {
             resetGroupLink = val;
             return this;
         public Builder withResetGroupLink(final boolean val) {
             resetGroupLink = val;
             return this;

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index b730fe2d852b2a6c09f1aabce7acbe121389d4ae..57f9c92411430969f6f86bfefe2cc04476842617 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -194,6 +194,8 @@ public class GroupHelper {
             final Set<RecipientId> removeMembers,
             final Set<RecipientId> admins,
             final Set<RecipientId> removeAdmins,
             final Set<RecipientId> removeMembers,
             final Set<RecipientId> admins,
             final Set<RecipientId> removeAdmins,

+            final Set<RecipientId> banMembers,
+            final Set<RecipientId> unbanMembers,

             final boolean resetGroupLink,
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final boolean resetGroupLink,
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,


@@ -213,6 +215,8 @@ public class GroupHelper {
                         removeMembers,
                         admins,
                         removeAdmins,
                         removeMembers,
                         admins,
                         removeAdmins,

+                        banMembers,
+                        unbanMembers,

                         resetGroupLink,
                         groupLinkState,
                         addMemberPermission,
                         resetGroupLink,
                         groupLinkState,
                         addMemberPermission,


@@ -230,6 +234,8 @@ public class GroupHelper {
                         removeMembers,
                         admins,
                         removeAdmins,
                         removeMembers,
                         admins,
                         removeAdmins,

+                        banMembers,
+                        unbanMembers,

                         resetGroupLink,
                         groupLinkState,
                         addMemberPermission,
                         resetGroupLink,
                         groupLinkState,
                         addMemberPermission,


@@ -467,6 +473,8 @@ public class GroupHelper {
             final Set<RecipientId> removeMembers,
             final Set<RecipientId> admins,
             final Set<RecipientId> removeAdmins,
             final Set<RecipientId> removeMembers,
             final Set<RecipientId> admins,
             final Set<RecipientId> removeAdmins,

+            final Set<RecipientId> banMembers,
+            final Set<RecipientId> unbanMembers,

             final boolean resetGroupLink,
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,
             final boolean resetGroupLink,
             final GroupLinkState groupLinkState,
             final GroupPermission addMemberPermission,


@@ -493,7 +501,13 @@ public class GroupHelper {
 
         if (removeMembers != null) {
             var existingRemoveMembers = new HashSet<>(removeMembers);
 
         if (removeMembers != null) {
             var existingRemoveMembers = new HashSet<>(removeMembers);

+            if (banMembers != null) {
+                existingRemoveMembers.addAll(banMembers);
+            }

             existingRemoveMembers.retainAll(group.getMembers());
             existingRemoveMembers.retainAll(group.getMembers());

+            if (members != null) {
+                existingRemoveMembers.removeAll(members);
+            }

             existingRemoveMembers.remove(account.getSelfRecipientId());// self can be removed with sendQuitGroupMessage
             if (existingRemoveMembers.size() > 0) {
                 var groupGroupChangePair = groupV2Helper.removeMembers(group, existingRemoveMembers);
             existingRemoveMembers.remove(account.getSelfRecipientId());// self can be removed with sendQuitGroupMessage
             if (existingRemoveMembers.size() > 0) {
                 var groupGroupChangePair = groupV2Helper.removeMembers(group, existingRemoveMembers);


@@ -535,6 +549,24 @@ public class GroupHelper {
             }
         }
 
             }
         }
 

+        if (banMembers != null) {
+            final var newlyBannedMembers = new HashSet<>(banMembers);
+            newlyBannedMembers.removeAll(group.getBannedMembers());
+            if (newlyBannedMembers.size() > 0) {
+                var groupGroupChangePair = groupV2Helper.banMembers(group, newlyBannedMembers);
+                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            }
+        }
+
+        if (unbanMembers != null) {
+            var existingUnbanMembers = new HashSet<>(unbanMembers);
+            existingUnbanMembers.retainAll(group.getBannedMembers());
+            if (existingUnbanMembers.size() > 0) {
+                var groupGroupChangePair = groupV2Helper.unbanMembers(group, existingUnbanMembers);
+                result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
+            }
+        }
+

         if (resetGroupLink) {
             var groupGroupChangePair = groupV2Helper.resetGroupLinkPassword(group);
             result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());
         if (resetGroupLink) {
             var groupGroupChangePair = groupV2Helper.resetGroupLinkPassword(group);
             result = sendUpdateGroupV2Message(group, groupGroupChangePair.first(), groupGroupChangePair.second());

diff --git a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
index 49582ac95ea61afd53d784807251f15ab1f45c5c..d56ce98feb3aa58973eb862ea89e0a074f82cee8 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
+++ b/lib/src/main/java/org/asamk/signal/manager/helper/GroupV2Helper.java
@@ -203,9 +203,13 @@ class GroupV2Helper {
                         credentials,
                         (uuid, credential) -> new GroupCandidate(uuid, Optional.ofNullable(credential)))
                 .collect(Collectors.toSet());
                         credentials,
                         (uuid, credential) -> new GroupCandidate(uuid, Optional.ofNullable(credential)))
                 .collect(Collectors.toSet());

+        final var bannedUuids = groupInfoV2.getBannedMembers()
+                .stream()
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+                .collect(Collectors.toSet());

 
         final var aci = getSelfAci();
 
         final var aci = getSelfAci();

-        final var change = groupOperations.createModifyGroupMembershipChange(candidates, Set.of(), aci.uuid());
+        final var change = groupOperations.createModifyGroupMembershipChange(candidates, bannedUuids, aci.uuid());

 
         change.setSourceUuid(getSelfAci().toByteString());
 
 
         change.setSourceUuid(getSelfAci().toByteString());
 


@@ -259,6 +263,40 @@ class GroupV2Helper {
         return revokeInvites(groupInfoV2, memberUuids);
     }
 
         return revokeInvites(groupInfoV2, memberUuids);
     }
 

+    Pair<DecryptedGroup, GroupChange> banMembers(
+            GroupInfoV2 groupInfoV2, Set<RecipientId> block
+    ) throws IOException {
+        GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
+
+        final var uuids = block.stream()
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+                .collect(Collectors.toSet());
+
+        final var change = groupOperations.createBanUuidsChange(uuids,
+                false,
+                groupInfoV2.getGroup().getBannedMembersList());
+
+        change.setSourceUuid(getSelfAci().toByteString());
+
+        return commitChange(groupInfoV2, change);
+    }
+
+    Pair<DecryptedGroup, GroupChange> unbanMembers(
+            GroupInfoV2 groupInfoV2, Set<RecipientId> block
+    ) throws IOException {
+        GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
+
+        final var uuids = block.stream()
+                .map(member -> context.getRecipientHelper().resolveSignalServiceAddress(member).getServiceId().uuid())
+                .collect(Collectors.toSet());
+
+        final var change = groupOperations.createUnbanUuidsChange(uuids);
+
+        change.setSourceUuid(getSelfAci().toByteString());
+
+        return commitChange(groupInfoV2, change);
+    }
+

     Pair<DecryptedGroup, GroupChange> resetGroupLinkPassword(GroupInfoV2 groupInfoV2) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var newGroupLinkPassword = GroupLinkPassword.createNew().serialize();
     Pair<DecryptedGroup, GroupChange> resetGroupLinkPassword(GroupInfoV2 groupInfoV2) throws IOException {
         final GroupsV2Operations.GroupOperations groupOperations = getGroupOperations(groupInfoV2);
         final var newGroupLinkPassword = GroupLinkPassword.createNew().serialize();

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
index 4d94eb01fbe141ca43fee9cbb349b8262b68cc52..3816dcc65c2f53457bef73e74c1c0c70f5659fad 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfo.java
@@ -26,6 +26,10 @@ public sealed abstract class GroupInfo permits GroupInfoV1, GroupInfoV2 {
 
     public abstract Set<RecipientId> getMembers();
 
 
     public abstract Set<RecipientId> getMembers();
 

+    public Set<RecipientId> getBannedMembers() {
+        return Set.of();
+    }
+

     public Set<RecipientId> getPendingMembers() {
         return Set.of();
     }
     public Set<RecipientId> getPendingMembers() {
         return Set.of();
     }

diff --git a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
index 23c80ba9dd407bc7b2a6cebf0bbd451b8a556c36..dc803f0f99195b4702e487831da1a3bcaf0632c4 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
+++ b/lib/src/main/java/org/asamk/signal/manager/storage/groups/GroupInfoV2.java
@@ -117,6 +117,18 @@ public final class GroupInfoV2 extends GroupInfo {
                 .collect(Collectors.toSet());
     }
 
                 .collect(Collectors.toSet());
     }
 

+    @Override
+    public Set<RecipientId> getBannedMembers() {
+        if (this.group == null) {
+            return Set.of();
+        }
+        return group.getBannedMembersList()
+                .stream()
+                .map(m -> ServiceId.fromByteString(m.getUuid()))
+                .map(recipientResolver::resolveRecipient)
+                .collect(Collectors.toSet());
+    }
+

     @Override
     public Set<RecipientId> getPendingMembers() {
         if (this.group == null) {
     @Override
     public Set<RecipientId> getPendingMembers() {
         if (this.group == null) {

diff --git a/man/signal-cli.1.adoc b/man/signal-cli.1.adoc
index 1a30b2e06a869c29381ade46da635118e80028ce..0562fcca0b15fc63e4e7fc0c9b4c03a5a7e283a8 100644 (file)
--- a/man/signal-cli.1.adoc
+++ b/man/signal-cli.1.adoc
@@ -357,6 +357,13 @@ Specify one or more members to make a group admin
 *--remove-admin* [MEMBER [MEMBER ...]]::
 Specify one or more members to remove group admin privileges
 
 *--remove-admin* [MEMBER [MEMBER ...]]::
 Specify one or more members to remove group admin privileges
 

+*--ban* [MEMBER [MEMBER ...]]::
+Specify one or more members to ban from joining the group.
+Banned members cannot join or request to join via a group link.
+
+*--unban* [MEMBER [MEMBER ...]]::
+Specify one or more members to remove from the ban list
+

 *--reset-link*::
 Reset group link and create new link password
 
 *--reset-link*::
 Reset group link and create new link password
 

diff --git a/src/main/java/org/asamk/Signal.java b/src/main/java/org/asamk/Signal.java
index fd91d8af0b64d5b38d4e16ed20a1c04733628ae0..caf55555a4184cf4919aa26a70ca9d41b8505c90 100644 (file)
--- a/src/main/java/org/asamk/Signal.java
+++ b/src/main/java/org/asamk/Signal.java
@@ -523,6 +523,7 @@ public interface Signal extends DBusInterface {
     @DBusProperty(name = "PendingMembers", type = String[].class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "RequestingMembers", type = String[].class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "Admins", type = String[].class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "PendingMembers", type = String[].class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "RequestingMembers", type = String[].class, access = DBusProperty.Access.READ)
     @DBusProperty(name = "Admins", type = String[].class, access = DBusProperty.Access.READ)

+    @DBusProperty(name = "Banned", type = String[].class, access = DBusProperty.Access.READ)

     @DBusProperty(name = "PermissionAddMember", type = String.class)
     @DBusProperty(name = "PermissionEditDetails", type = String.class)
     @DBusProperty(name = "PermissionSendMessage", type = String.class)
     @DBusProperty(name = "PermissionAddMember", type = String.class)
     @DBusProperty(name = "PermissionEditDetails", type = String.class)
     @DBusProperty(name = "PermissionSendMessage", type = String.class)

diff --git a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
index 84e458b3ab71172ed4db98696eb4f9b751f54aac..80e583af7318bec1f8b6af95e12901b007cef46c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ListGroupsCommand.java
@@ -53,7 +53,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
             final var groupInviteLink = group.groupInviteLinkUrl();
 
             writer.println(
             final var groupInviteLink = group.groupInviteLinkUrl();
 
             writer.println(

-                    "Id: {} Name: {} Description: {} Active: {} Blocked: {} Members: {} Pending members: {} Requesting members: {} Admins: {} Message expiration: {} Link: {}",
+                    "Id: {} Name: {} Description: {} Active: {} Blocked: {} Members: {} Pending members: {} Requesting members: {} Admins: {} Banned: {} Message expiration: {} Link: {}",

                     group.groupId().toBase64(),
                     group.title(),
                     group.description(),
                     group.groupId().toBase64(),
                     group.title(),
                     group.description(),


@@ -63,6 +63,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                     resolveMembers(group.pendingMembers()),
                     resolveMembers(group.requestingMembers()),
                     resolveMembers(group.adminMembers()),
                     resolveMembers(group.pendingMembers()),
                     resolveMembers(group.requestingMembers()),
                     resolveMembers(group.adminMembers()),

+                    resolveMembers(group.bannedMembers()),

                     group.messageExpirationTimer() == 0 ? "disabled" : group.messageExpirationTimer() + "s",
                     groupInviteLink == null ? '-' : groupInviteLink.getUrl());
         } else {
                     group.messageExpirationTimer() == 0 ? "disabled" : group.messageExpirationTimer() + "s",
                     groupInviteLink == null ? '-' : groupInviteLink.getUrl());
         } else {


@@ -95,6 +96,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
                         resolveJsonMembers(group.pendingMembers()),
                         resolveJsonMembers(group.requestingMembers()),
                         resolveJsonMembers(group.adminMembers()),
                         resolveJsonMembers(group.pendingMembers()),
                         resolveJsonMembers(group.requestingMembers()),
                         resolveJsonMembers(group.adminMembers()),

+                        resolveJsonMembers(group.bannedMembers()),

                         group.permissionAddMember().name(),
                         group.permissionEditDetails().name(),
                         group.permissionSendMessage().name(),
                         group.permissionAddMember().name(),
                         group.permissionEditDetails().name(),
                         group.permissionSendMessage().name(),


@@ -122,6 +124,7 @@ public class ListGroupsCommand implements JsonRpcLocalCommand {
             Set<JsonGroupMember> pendingMembers,
             Set<JsonGroupMember> requestingMembers,
             Set<JsonGroupMember> admins,
             Set<JsonGroupMember> pendingMembers,
             Set<JsonGroupMember> requestingMembers,
             Set<JsonGroupMember> admins,

+            Set<JsonGroupMember> banned,

             String permissionAddMember,
             String permissionEditDetails,
             String permissionSendMessage,
             String permissionAddMember,
             String permissionEditDetails,
             String permissionSendMessage,

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 2a6d7d156aff7a7055939468be2a1fceb2e6fbae..411ae74762fbf84b1d130af4a35bd019297cad45 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -55,6 +55,8 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
         subparser.addArgument("--remove-admin")
                 .nargs("*")
                 .help("Specify one or more members to remove group admin privileges");
         subparser.addArgument("--remove-admin")
                 .nargs("*")
                 .help("Specify one or more members to remove group admin privileges");

+        subparser.addArgument("--ban").nargs("*").help("Specify one or more members to ban from joining the group");
+        subparser.addArgument("--unban").nargs("*").help("Specify one or more members to remove from the ban list");

 
         subparser.addArgument("--reset-link")
                 .action(Arguments.storeTrue())
 
         subparser.addArgument("--reset-link")
                 .action(Arguments.storeTrue())


@@ -114,6 +116,8 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
         var groupRemoveMembers = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-member"), localNumber);
         var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), localNumber);
         var groupRemoveAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-admin"), localNumber);
         var groupRemoveMembers = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-member"), localNumber);
         var groupAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("admin"), localNumber);
         var groupRemoveAdmins = CommandUtil.getSingleRecipientIdentifiers(ns.getList("remove-admin"), localNumber);

+        var groupBan = CommandUtil.getSingleRecipientIdentifiers(ns.getList("ban"), localNumber);
+        var groupUnban = CommandUtil.getSingleRecipientIdentifiers(ns.getList("unban"), localNumber);

         var groupAvatar = ns.getString("avatar");
         var groupResetLink = Boolean.TRUE.equals(ns.getBoolean("reset-link"));
         var groupLinkState = getGroupLinkState(ns.getString("link"));
         var groupAvatar = ns.getString("avatar");
         var groupResetLink = Boolean.TRUE.equals(ns.getBoolean("reset-link"));
         var groupLinkState = getGroupLinkState(ns.getString("link"));


@@ -145,6 +149,8 @@ public class UpdateGroupCommand implements JsonRpcLocalCommand {
                             .withRemoveMembers(groupRemoveMembers)
                             .withAdmins(groupAdmins)
                             .withRemoveAdmins(groupRemoveAdmins)
                             .withRemoveMembers(groupRemoveMembers)
                             .withAdmins(groupAdmins)
                             .withRemoveAdmins(groupRemoveAdmins)

+                            .withBanMembers(groupBan)
+                            .withUnbanMembers(groupUnban)

                             .withResetGroupLink(groupResetLink)
                             .withGroupLinkState(groupLinkState)
                             .withAddMemberPermission(groupAddMemberPermission)
                             .withResetGroupLink(groupResetLink)
                             .withGroupLinkState(groupLinkState)
                             .withAddMemberPermission(groupAddMemberPermission)

diff --git a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
index 8d8d333f290f475bd46f7efa7872f66ab34accee..ed27ad6dd98500bb383d770584adf2198175cbac 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java
@@ -583,6 +583,9 @@ public class DbusManagerImpl implements Manager {
                     ((List<String>) group.get("Admins").getValue()).stream()
                             .map(m -> new RecipientAddress(null, m))
                             .collect(Collectors.toSet()),
                     ((List<String>) group.get("Admins").getValue()).stream()
                             .map(m -> new RecipientAddress(null, m))
                             .collect(Collectors.toSet()),

+                    ((List<String>) group.get("Banned").getValue()).stream()
+                            .map(m -> new RecipientAddress(null, m))
+                            .collect(Collectors.toSet()),

                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),
                     GroupPermission.valueOf((String) group.get("PermissionAddMember").getValue()),
                     (boolean) group.get("IsBlocked").getValue(),
                     (int) group.get("MessageExpirationTimer").getValue(),
                     GroupPermission.valueOf((String) group.get("PermissionAddMember").getValue()),

diff --git a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
index ad6f45462d4c358dc3ae07a9f713f16953fa32d5..850bcf1d824fb04830f07cb8b2de6a6960d7ea80 100644 (file)
--- a/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
+++ b/src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java
@@ -1162,6 +1162,8 @@ public class DbusSignalImpl implements Signal {
                                     () -> new Variant<>(getRecipientStrings(getGroup().requestingMembers()), "as")),
                             new DbusProperty<>("Admins",
                                     () -> new Variant<>(getRecipientStrings(getGroup().adminMembers()), "as")),
                                     () -> new Variant<>(getRecipientStrings(getGroup().requestingMembers()), "as")),
                             new DbusProperty<>("Admins",
                                     () -> new Variant<>(getRecipientStrings(getGroup().adminMembers()), "as")),

+                            new DbusProperty<>("Banned",
+                                    () -> new Variant<>(getRecipientStrings(getGroup().bannedMembers()), "as")),

                             new DbusProperty<>("PermissionAddMember",
                                     () -> getGroup().permissionAddMember().name(),
                                     this::setGroupPermissionAddMember),
                             new DbusProperty<>("PermissionAddMember",
                                     () -> getGroup().permissionAddMember().name(),
                                     this::setGroupPermissionAddMember),