Merge 0fb4e1c71e into 5f084adf94

src/Discord.Net.Core/Entities/Channels/GuildChannelProperties.cs

@@ -1,4 +1,4 @@
-namespace Discord
+namespace Discord
 {
     /// <summary>
     /// Modify an IGuildChannel with the specified changes.
@@ -30,5 +30,9 @@
         /// Sets the category for this channel
         /// </summary>
         public Optional<ulong?> CategoryId { get; set; }
+        /// <summary>
+        /// Syncs the permission with the channel's parent (category).
+        /// </summary>
+        public Optional<bool> SyncWithCategory { get; set; }
     }
 }

src/Discord.Net.Rest/API/Common/Overwrite.cs

@@ -1,4 +1,4 @@
-#pragma warning disable CS1591
+#pragma warning disable CS1591
 using Newtonsoft.Json;
 
 namespace Discord.API
@@ -13,5 +13,13 @@ namespace Discord.API
         public ulong Deny { get; set; }
         [JsonProperty("allow"), Int53]
         public ulong Allow { get; set; }
+
+        public Overwrite(ulong targetId, PermissionTarget targetType, ulong allowValue, ulong denyValue)
+        {
+            TargetId = targetId;
+            TargetType = targetType;
+            Allow = allowValue;
+            Deny = denyValue;
+        }
     }
 }

src/Discord.Net.Rest/API/Rest/ModifyGuildChannelParams.cs

@@ -12,5 +12,7 @@ namespace Discord.API.Rest
         public Optional<int> Position { get; set; }
         [JsonProperty("parent_id")]
         public Optional<ulong?> CategoryId { get; set; }
+        [JsonProperty("permission_overwrites")]
+        public Optional<Overwrite[]> Overwrites { get; set; }
     }
 }

src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs

@@ -19,6 +19,7 @@ namespace Discord.Rest
         {
             await client.ApiClient.DeleteChannelAsync(channel.Id, options).ConfigureAwait(false);
         }
+
         public static async Task<Model> ModifyAsync(IGuildChannel channel, BaseDiscordClient client,
             Action<GuildChannelProperties> func,
             RequestOptions options)
@@ -31,6 +32,16 @@ namespace Discord.Rest
                 Position = args.Position,
                 CategoryId = args.CategoryId
             };
+            if (args.SyncWithCategory.IsSpecified && args.SyncWithCategory.Value)
+            {
+                var categoryChannel = await channel.GetCategoryAsync().ConfigureAwait(false);
+                if (categoryChannel != null)
+                    apiArgs.Overwrites = categoryChannel.PermissionOverwrites
+                        .Select(overwrite => new API.Overwrite(overwrite.TargetId, overwrite.TargetType,
+                            overwrite.Permissions.AllowValue, overwrite.Permissions.DenyValue))
+                        .ToArray();
+            }
+
             return await client.ApiClient.ModifyGuildChannelAsync(channel.Id, apiArgs, options).ConfigureAwait(false);
         }
         public static async Task<Model> ModifyAsync(ITextChannel channel, BaseDiscordClient client,

src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;

src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs

@@ -1,4 +1,4 @@
-using Discord.Rest;
+using Discord.Rest;
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;