From 93878e4a9061253dd8f5874af75057cc71924f0d Mon Sep 17 00:00:00 2001 From: HelpfulStranger999 Date: Mon, 18 Jun 2018 14:57:58 -0500 Subject: [PATCH 1/3] Refactors an unused parameter in CommandService#Search (#1025) --- src/Discord.Net.Commands/CommandService.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Discord.Net.Commands/CommandService.cs b/src/Discord.Net.Commands/CommandService.cs index f75653ccf..8e5297e49 100644 --- a/src/Discord.Net.Commands/CommandService.cs +++ b/src/Discord.Net.Commands/CommandService.cs @@ -322,8 +322,10 @@ namespace Discord.Commands //Execution public SearchResult Search(ICommandContext context, int argPos) - => Search(context, context.Message.Content.Substring(argPos)); + => Search(context.Message.Content.Substring(argPos)); public SearchResult Search(ICommandContext context, string input) + => Search(input); + public SearchResult Search(string input) { string searchInput = _caseSensitive ? input : input.ToLowerInvariant(); var matches = _map.GetCommands(searchInput).OrderByDescending(x => x.Command.Priority).ToImmutableArray(); @@ -339,7 +341,8 @@ namespace Discord.Commands public async Task ExecuteAsync(ICommandContext context, string input, IServiceProvider services, MultiMatchHandling multiMatchHandling = MultiMatchHandling.Exception) { services = services ?? EmptyServiceProvider.Instance; - var searchResult = Search(context, input); + + var searchResult = Search(input); if (!searchResult.IsSuccess) return searchResult; From 033d31294f54945a2b9b2aa17c8d356fcffb4c83 Mon Sep 17 00:00:00 2001 From: HelpfulStranger999 Date: Mon, 18 Jun 2018 15:00:40 -0500 Subject: [PATCH 2/3] Creates full guild user object, resolves #1047 (#1078) --- src/Discord.Net.Rest/ClientHelper.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Discord.Net.Rest/ClientHelper.cs b/src/Discord.Net.Rest/ClientHelper.cs index a1f8ece69..0bba0d2c4 100644 --- a/src/Discord.Net.Rest/ClientHelper.cs +++ b/src/Discord.Net.Rest/ClientHelper.cs @@ -142,9 +142,14 @@ namespace Discord.Rest public static async Task GetGuildUserAsync(BaseDiscordClient client, ulong guildId, ulong id, RequestOptions options) { + var guild = await GetGuildAsync(client, guildId, options).ConfigureAwait(false); + if (guild == null) + return null; + var model = await client.ApiClient.GetGuildMemberAsync(guildId, id, options).ConfigureAwait(false); if (model != null) - return RestGuildUser.Create(client, new RestGuild(client, guildId), model); + return RestGuildUser.Create(client, guild, model); + return null; } From aff4512fcd446ce4ec6468c2c8b50e66aa86548d Mon Sep 17 00:00:00 2001 From: Builderb Date: Mon, 18 Jun 2018 21:02:08 +0100 Subject: [PATCH 3/3] Update Discord.Net.Core.csproj (#1081) --- src/Discord.Net.Core/Discord.Net.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Net.Core/Discord.Net.Core.csproj b/src/Discord.Net.Core/Discord.Net.Core.csproj index 6a58367e6..d4d450e1c 100644 --- a/src/Discord.Net.Core/Discord.Net.Core.csproj +++ b/src/Discord.Net.Core/Discord.Net.Core.csproj @@ -9,7 +9,7 @@ - +