GetStream#130 Remove and add members can now pass initiator

erdtsieck · Sep 28, 2023 · 558e9ba · 558e9ba
1 parent 910df4d
commit 558e9ba
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/src/Clients/ChannelClient.Members.cs b/src/Clients/ChannelClient.Members.cs
@@ -8,6 +8,9 @@ namespace StreamChat.Clients
 {
     public partial class ChannelClient
     {
+        public async Task<ApiResponse> AddMembersAsync(string channelType, string channelId, AddMemberOptions options, params string[] userIds)
+            => await AddMembersAsync(channelType, channelId, userIds, null, options);
+
         public async Task<ApiResponse> AddMembersAsync(string channelType, string channelId, params string[] userIds)
             => await AddMembersAsync(channelType, channelId, userIds, null, null);
 
@@ -20,16 +23,18 @@ public async Task<ApiResponse> AddMembersAsync(string channelType, string channe
                     AddMembers = userIds,
                     HideHistory = options?.HideHistory,
                     Message = msg,
+                    UserId = options?.InitiatorUserId,
                 });
 
-        public async Task<ApiResponse> RemoveMembersAsync(string channelType, string channelId, IEnumerable<string> userIds, MessageRequest msg = null)
+        public async Task<ApiResponse> RemoveMembersAsync(string channelType, string channelId, IEnumerable<string> userIds, MessageRequest msg = null, RemoveMemberOptions options = null)
             => await ExecuteRequestAsync<ApiResponse>($"channels/{channelType}/{channelId}",
                 HttpMethod.POST,
                 HttpStatusCode.Created,
                 new ChannelUpdateRequest
                 {
                     RemoveMembers = userIds,
                     Message = msg,
+                    UserId = options?.InitiatorUserId,
                 });
 
         public async Task<QueryMembersResponse> QueryMembersAsync(QueryMembersRequest queryMembersRequest)

diff --git a/src/Clients/IChannelClient.cs b/src/Clients/IChannelClient.cs
@@ -10,6 +10,12 @@ namespace StreamChat.Clients
     /// <remarks>https://getstream.io/chat/docs/dotnet-csharp/creating_channels/?language=csharp</remarks>
     public interface IChannelClient
     {
+        /// <summary>
+        /// Adds members to a channel.
+        /// </summary>
+        /// <remarks>https://getstream.io/chat/docs/dotnet-csharp/channel_members/?language=csharp</remarks>
+        Task<ApiResponse> AddMembersAsync(string channelType, string channelId, AddMemberOptions options, params string[] userIds);
+
         /// <summary>
         /// Adds members to a channel.
         /// </summary>
@@ -162,7 +168,7 @@ public interface IChannelClient
         /// Removes member(s) from a channel.
         /// </summary>
         /// <remarks>https://getstream.io/chat/docs/dotnet-csharp/channel_members/?language=csharp</remarks>
-        Task<ApiResponse> RemoveMembersAsync(string channelType, string channelId, IEnumerable<string> userIds, MessageRequest msg = null);
+        Task<ApiResponse> RemoveMembersAsync(string channelType, string channelId, IEnumerable<string> userIds, MessageRequest msg = null, RemoveMemberOptions options = null);
 
         /// <summary>
         /// <para>Removes all of the messages but not affect the channel data or channel members.</para>

diff --git a/src/Models/User.cs b/src/Models/User.cs
@@ -66,6 +66,12 @@ public class OwnUser
     public class AddMemberOptions
     {
         public bool? HideHistory { get; set; }
+        public string InitiatorUserId { get; set; }
+    }
+
+    public class RemoveMemberOptions
+    {
+        public string InitiatorUserId { get; set; }
     }
 
     public class UserPartialRequest : CustomDataBase

diff --git a/tests/ChannelClientTests.cs b/tests/ChannelClientTests.cs
@@ -215,6 +215,19 @@ await WaitForAsync(async () =>
             }, timeout: 10000);
         }
 
+        [Test]
+        public async Task TestAddMembersWithInitiatorAsync()
+        {
+            var initiatingUser = await UpsertNewUserAsync();
+            var newUser = await UpsertNewUserAsync();
+
+            await _channelClient.AddMembersAsync(_channel.Type, _channel.Id, new AddMemberOptions{ InitiatorUserId = initiatingUser.Id }, newUser.Id);
+
+            var channel = await _channelClient.GetOrCreateAsync(_channel.Type, _channel.Id, ChannelGetRequest.WithoutWatching());
+            channel.Members.Should().Contain(x => x.UserId == newUser.Id);
+            await TryDeleteUsersAsync(new[] { newUser.Id });
+        }
+
         [Test]
         public async Task TestAddMembersAsync()
         {
@@ -227,6 +240,18 @@ public async Task TestAddMembersAsync()
             await TryDeleteUsersAsync(new[] { newUser.Id });
         }
 
+        [Test]
+        public async Task TestRemoveMembersWithInitiatorAsync()
+        {
+            await _channelClient.RemoveMembersAsync(_channel.Type, _channel.Id, new[] { _user3.Id }, options: new RemoveMemberOptions
+            {
+                InitiatorUserId = _user1.Id
+            });
+
+            var channel = await _channelClient.GetOrCreateAsync(_channel.Type, _channel.Id, ChannelGetRequest.WithoutWatching());
+            channel.Members.Should().NotContain(x => x.UserId == _user3.Id);
+        }
+
         [Test]
         public async Task TestRemoveMembersAsync()
         {