Browse Source

Remove unnecessary call for REST if user didn't specify the bool

pull/1016/head
Hsu Still 8 years ago
parent
commit
00f2a08bcb
3 changed files with 11 additions and 11 deletions
  1. +9
    -8
      src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
  2. +1
    -2
      src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs
  3. +1
    -1
      src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs

+ 9
- 8
src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs View File

@@ -22,7 +22,6 @@ namespace Discord.Rest

public static async Task<Model> ModifyAsync(IGuildChannel channel, BaseDiscordClient client,
Action<GuildChannelProperties> func,
IEnumerable<Overwrite> overwrites,
RequestOptions options)
{
var args = new GuildChannelProperties();
@@ -31,14 +30,16 @@ namespace Discord.Rest
{
Name = args.Name,
Position = args.Position,
CategoryId = args.CategoryId,
Overwrites = args.SyncWithParent.Value
? overwrites
.Select(overwrite => new API.Overwrite(overwrite.TargetId, overwrite.TargetType,
overwrite.Permissions.AllowValue, overwrite.Permissions.DenyValue))
.ToArray()
: null
CategoryId = args.CategoryId
};
if (args.SyncWithParent.IsSpecified && args.SyncWithParent.Value)
{
var categoryChannel = await channel.GetCategoryAsync().ConfigureAwait(false);
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,


+ 1
- 2
src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs View File

@@ -58,8 +58,7 @@ namespace Discord.Rest
}
public async Task ModifyAsync(Action<GuildChannelProperties> func, RequestOptions options = null)
{
var categoryChannel = await GetCategoryAsync().ConfigureAwait(false);
var model = await ChannelHelper.ModifyAsync(this, Discord, func, categoryChannel.PermissionOverwrites, options).ConfigureAwait(false);
var model = await ChannelHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false);
Update(model);
}
public Task DeleteAsync(RequestOptions options = null)


+ 1
- 1
src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs View File

@@ -58,7 +58,7 @@ namespace Discord.WebSocket
}

public Task ModifyAsync(Action<GuildChannelProperties> func, RequestOptions options = null)
=> ChannelHelper.ModifyAsync(this, Discord, func, Category.PermissionOverwrites, options);
=> ChannelHelper.ModifyAsync(this, Discord, func, options);
public Task DeleteAsync(RequestOptions options = null)
=> ChannelHelper.DeleteAsync(this, Discord, options);



Loading…
Cancel
Save