github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed new params classes to XXXProperties

Browse Source
This commit is contained in:
RogueException
2016-12-23 15:22:59 -04:00
parent 8326d01f62
commit 572c0e6c6b
45 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Discord.Net.Rest/Entities/Channels/ChannelHelper.cs
View File

@@ -19,10 +19,10 @@ namespace Discord.Rest
await client.ApiClient.DeleteChannelAsync(channel.Id, options).ConfigureAwait(false);
}
public static async Task<Model> ModifyAsync(IGuildChannel channel, BaseDiscordClient client,
Action<ModifyGuildChannelParams> func,
Action<GuildChannelProperties> func,
RequestOptions options)
{
var args = new ModifyGuildChannelParams();
var args = new GuildChannelProperties();
func(args);
var apiArgs = new API.Rest.ModifyGuildChannelParams
{

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

@@ -54,7 +54,7 @@ namespace Discord.Rest
var model = await Discord.ApiClient.GetChannelAsync(GuildId, Id, options).ConfigureAwait(false);
Update(model);
}
public async Task ModifyAsync(Action<ModifyGuildChannelParams> func, RequestOptions options = null)
public async Task ModifyAsync(Action<GuildChannelProperties> func, RequestOptions options = null)
{
var model = await ChannelHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false);
Update(model);

12
src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
View File

@@ -15,11 +15,11 @@ namespace Discord.Rest
{
//General
public static async Task<Model> ModifyAsync(IGuild guild, BaseDiscordClient client,
Action<ModifyGuildParams> func, RequestOptions options)
Action<GuildProperties> func, RequestOptions options)
{
if (func == null) throw new NullReferenceException(nameof(func));
var args = new ModifyGuildParams();
var args = new GuildProperties();
func(args);
var apiArgs = new API.Rest.ModifyGuildParams
@@ -57,11 +57,11 @@ namespace Discord.Rest
return await client.ApiClient.ModifyGuildAsync(guild.Id, apiArgs, options).ConfigureAwait(false);
}
public static async Task<EmbedModel> ModifyEmbedAsync(IGuild guild, BaseDiscordClient client,
Action<ModifyGuildEmbedParams> func, RequestOptions options)
Action<GuildEmbedProperties> func, RequestOptions options)
{
if (func == null) throw new NullReferenceException(nameof(func));
var args = new ModifyGuildEmbedParams();
var args = new GuildEmbedProperties();
func(args);
var apiArgs = new API.Rest.ModifyGuildEmbedParams
{
@@ -76,13 +76,13 @@ namespace Discord.Rest
return await client.ApiClient.ModifyGuildEmbedAsync(guild.Id, apiArgs, options).ConfigureAwait(false);
}
public static async Task ModifyChannelsAsync(IGuild guild, BaseDiscordClient client,
IEnumerable<GuildChannelsProperties> args, RequestOptions options)
IEnumerable<BulkGuildChannelProperties> args, RequestOptions options)
{
var apiArgs = args.Select(x => new API.Rest.ModifyGuildChannelsParams(x.Id, x.Position));
await client.ApiClient.ModifyGuildChannelsAsync(guild.Id, apiArgs, options).ConfigureAwait(false);
}
public static async Task<IReadOnlyCollection<RoleModel>> ModifyRolesAsync(IGuild guild, BaseDiscordClient client,
IEnumerable<ModifyGuildRolesParams> args, RequestOptions options)
IEnumerable<BulkRoleProperties> args, RequestOptions options)
{
var apiArgs = args.Select(x => new API.Rest.ModifyGuildRolesParams(x.Id)
{

8
src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
View File

@@ -105,22 +105,22 @@ namespace Discord.Rest
public Task DeleteAsync(RequestOptions options = null)
=> GuildHelper.DeleteAsync(this, Discord, options);
public async Task ModifyAsync(Action<ModifyGuildParams> func, RequestOptions options = null)
public async Task ModifyAsync(Action<GuildProperties> func, RequestOptions options = null)
{
var model = await GuildHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false);
Update(model);
}
public async Task ModifyEmbedAsync(Action<ModifyGuildEmbedParams> func, RequestOptions options = null)
public async Task ModifyEmbedAsync(Action<GuildEmbedProperties> func, RequestOptions options = null)
{
var model = await GuildHelper.ModifyEmbedAsync(this, Discord, func, options).ConfigureAwait(false);
Update(model);
}
public async Task ModifyChannelsAsync(IEnumerable<GuildChannelsProperties> args, RequestOptions options = null)
public async Task ModifyChannelsAsync(IEnumerable<BulkGuildChannelProperties> args, RequestOptions options = null)
{
var arr = args.ToArray();
await GuildHelper.ModifyChannelsAsync(this, Discord, arr, options);
}
public async Task ModifyRolesAsync(IEnumerable<ModifyGuildRolesParams> args, RequestOptions options = null)
public async Task ModifyRolesAsync(IEnumerable<BulkRoleProperties> args, RequestOptions options = null)
{
var models = await GuildHelper.ModifyRolesAsync(this, Discord, args, options).ConfigureAwait(false);
foreach (var model in models)

4
src/Discord.Net.Rest/Entities/Guilds/RestGuildIntegration.cs
View File

@@ -55,11 +55,11 @@ namespace Discord.Rest
{
await Discord.ApiClient.DeleteGuildIntegrationAsync(GuildId, Id).ConfigureAwait(false);
}
public async Task ModifyAsync(Action<ModifyGuildIntegrationParams> func)
public async Task ModifyAsync(Action<GuildIntegrationProperties> func)
{
if (func == null) throw new NullReferenceException(nameof(func));
var args = new ModifyGuildIntegrationParams();
var args = new GuildIntegrationProperties();
func(args);
var apiArgs = new API.Rest.ModifyGuildIntegrationParams
{

4
src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs
View File

@@ -10,10 +10,10 @@ namespace Discord.Rest
{
internal static class MessageHelper
{
public static async Task<Model> ModifyAsync(IMessage msg, BaseDiscordClient client, Action<ModifyMessageParams> func,
public static async Task<Model> ModifyAsync(IMessage msg, BaseDiscordClient client, Action<MessageProperties> func,
RequestOptions options)
{
var args = new ModifyMessageParams();
var args = new MessageProperties();
func(args);
var apiArgs = new API.Rest.ModifyMessageParams
{

2
src/Discord.Net.Rest/Entities/Messages/RestUserMessage.cs
View File

@@ -126,7 +126,7 @@ namespace Discord.Rest
}
}
public async Task ModifyAsync(Action<ModifyMessageParams> func, RequestOptions options)
public async Task ModifyAsync(Action<MessageProperties> func, RequestOptions options)
{
var model = await MessageHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false);
Update(model);

2
src/Discord.Net.Rest/Entities/Roles/RestRole.cs
View File

@@ -44,7 +44,7 @@ namespace Discord.Rest
Permissions = new GuildPermissions(model.Permissions);
}
public async Task ModifyAsync(Action<ModifyGuildRoleParams> func, RequestOptions options = null)
public async Task ModifyAsync(Action<RoleProperties> func, RequestOptions options = null)
{
var model = await RoleHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false);
Update(model);

4
src/Discord.Net.Rest/Entities/Roles/RoleHelper.cs
View File

@@ -14,9 +14,9 @@ namespace Discord.Rest
await client.ApiClient.DeleteGuildRoleAsync(role.Guild.Id, role.Id, options).ConfigureAwait(false);
}
public static async Task<Model> ModifyAsync(IRole role, BaseDiscordClient client,
Action<ModifyGuildRoleParams> func, RequestOptions options)
Action<RoleProperties> func, RequestOptions options)
{
var args = new ModifyGuildRoleParams();
var args = new RoleProperties();
func(args);
var apiArgs = new API.Rest.ModifyGuildRoleParams
{

2
src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs
View File

@@ -68,7 +68,7 @@ namespace Discord.Rest
var model = await Discord.ApiClient.GetGuildMemberAsync(GuildId, Id, options).ConfigureAwait(false);
Update(model);
}
public async Task ModifyAsync(Action<ModifyGuildMemberParams> func, RequestOptions options = null)
public async Task ModifyAsync(Action<GuildUserProperties> func, RequestOptions options = null)
{
var args = await UserHelper.ModifyAsync(this, Discord, func, options).ConfigureAwait(false);
if (args.Deaf.IsSpecified)

2
src/Discord.Net.Rest/Entities/Users/RestSelfUser.cs
View File

@@ -43,7 +43,7 @@ namespace Discord.Rest
Update(model);
}
public async Task ModifyAsync(Action<ModifyCurrentUserParams> func, RequestOptions options = null)
public async Task ModifyAsync(Action<SelfUserProperties> func, RequestOptions options = null)
{
if (Id != Discord.CurrentUser.Id)
throw new InvalidOperationException("Unable to modify this object using a different token.");

14
src/Discord.Net.Rest/Entities/Users/UserHelper.cs
View File

@@ -9,10 +9,10 @@ namespace Discord.Rest
{
internal static class UserHelper
{
public static async Task<Model> ModifyAsync(ISelfUser user, BaseDiscordClient client, Action<ModifyCurrentUserParams> func,
public static async Task<Model> ModifyAsync(ISelfUser user, BaseDiscordClient client, Action<SelfUserProperties> func,
RequestOptions options)
{
var args = new ModifyCurrentUserParams();
var args = new SelfUserProperties();
func(args);
var apiArgs = new API.Rest.ModifyCurrentUserParams
{
@@ -25,19 +25,23 @@ namespace Discord.Rest
return await client.ApiClient.ModifySelfAsync(apiArgs, options).ConfigureAwait(false);
}
public static async Task<ModifyGuildMemberParams> ModifyAsync(IGuildUser user, BaseDiscordClient client, Action<ModifyGuildMemberParams> func,
public static async Task<GuildUserProperties> ModifyAsync(IGuildUser user, BaseDiscordClient client, Action<GuildUserProperties> func,
RequestOptions options)
{
var args = new ModifyGuildMemberParams();
var args = new GuildUserProperties();
func(args);
var apiArgs = new API.Rest.ModifyGuildMemberParams
{
ChannelId = args.Channel.IsSpecified ? args.Channel.Value.Id : Optional.Create<ulong>(),
Deaf = args.Deaf,
Mute = args.Mute,
Nickname = args.Nickname
};
if (args.Channel.IsSpecified)
apiArgs.ChannelId = args.Channel.Value.Id;
else if (args.ChannelId.IsSpecified)
apiArgs.ChannelId = args.ChannelId.Value;
if (args.Roles.IsSpecified)
apiArgs.RoleIds = args.Roles.Value.Select(x => x.Id).ToArray();
else if (args.RoleIds.IsSpecified)