Support for blocking groups

Author: Trolldemorted

libsignal-service-dotnet/SignalServiceMessageSender.cs

@@ -483,6 +483,10 @@ private byte[] CreateMultiDeviceBlockedContent(BlockedListMessage blocked)
             Blocked blockedMessage = new Blocked { };
 
             blockedMessage.Numbers.AddRange(blocked.Numbers);
+            foreach (var groupId in blocked.GroupIds)
+            {
+                blockedMessage.GroupIds.Add(ByteString.CopyFrom(groupId));
+            }
             syncMessage.Blocked = blockedMessage;
             content.SyncMessage = syncMessage;
             return content.ToByteArray();

libsignal-service-dotnet/messages/multidevice/BlockedListMessage.cs

@@ -5,11 +5,13 @@ namespace libsignalservice.messages.multidevice
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     public class BlockedListMessage
     {
-        public List<string> Numbers { get; }
+        public List<string> Numbers { get; }
+        public List<byte[]> GroupIds { get; }
 
-        public BlockedListMessage(List<string> numbers)
+        public BlockedListMessage(List<string> numbers, List<byte[]> groupIds)
         {
-            Numbers = numbers;
+            Numbers = numbers;
+            GroupIds = groupIds;
         }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member

libsignal-service-dotnet/messages/multidevice/DeviceGroup.cs

@@ -13,8 +13,9 @@ public class DeviceGroup
         public bool Active { get; }
         public uint? ExpirationTimer { get; }
         public string? Color { get; }
+        public bool Blocked { get; }
 
-        public DeviceGroup(byte[] id, string? name, IList<string> members, SignalServiceAttachmentStream? avatar, bool active, uint? expirationTimer, string? color)
+        public DeviceGroup(byte[] id, string? name, IList<string> members, SignalServiceAttachmentStream? avatar, bool active, uint? expirationTimer, string? color, bool blocked)
         {
             Id = id;
             Name = name;
@@ -23,6 +24,7 @@ public DeviceGroup(byte[] id, string? name, IList<string> members, SignalService
             Active = active;
             ExpirationTimer = expirationTimer;
             Color = color;
+            Blocked = blocked;
         }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member

libsignal-service-dotnet/messages/multidevice/DeviceGroupsInputStream.cs

@@ -29,6 +29,7 @@ public DeviceGroup Read()
             bool active = details.Active;
             uint? expirationTimer = null;
             string? color = details.ColorOneofCase == GroupDetails.ColorOneofOneofCase.Color ? details.Color : null;
+            var blocked = details.Blocked;
 
             if (details.AvatarOneofCase == GroupDetails.AvatarOneofOneofCase.Avatar)
             {
@@ -43,7 +44,7 @@ public DeviceGroup Read()
                 expirationTimer = details.ExpireTimer;
             }
 
-            return new DeviceGroup(id, name, members, avatar, active, expirationTimer, color);
+            return new DeviceGroup(id, name, members, avatar, active, expirationTimer, color, blocked);
         }
     }
 #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member

libsignal-service-dotnet/protobuf/SignalService.proto

@@ -211,6 +211,7 @@ message SyncMessage {
 
   message Blocked {
     repeated string numbers = 1;
+    repeated bytes groupIds = 2;
   }
 
   message Request {
@@ -307,4 +308,5 @@ message GroupDetails {
   oneof active_oneof				{ bool   active  = 5; } //[default = true] ### }
   oneof expireTimer_oneof           { uint32 expireTimer = 6; }
   oneof color_oneof                 { string color = 7; }
+  oneof blocked_oneof               { bool blocked = 8; }
 }