Merge branch 'dev' into docs/pre-release

src/Discord.Net.Commands/CommandService.cs

@@ -414,7 +414,7 @@ namespace Discord.Commands
         /// <param name="argPos">The position of which the command starts at.</param>
         /// <returns>The result containing the matching commands.</returns>
         public SearchResult Search(ICommandContext context, int argPos)
-            => Search(context, context.Message.Content.Substring(argPos));
+            => Search(context.Message.Content.Substring(argPos));
         /// <summary>
         ///     Searches for the command.
         /// </summary>
@@ -422,6 +422,8 @@ namespace Discord.Commands
         /// <param name="input">The command string.</param>
         /// <returns>The result containing the matching commands.</returns>
         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();
@@ -453,7 +455,8 @@ namespace Discord.Commands
         public async Task<IResult> 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;
 

src/Discord.Net.Core/Discord.Net.Core.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
     <PackageReference Include="System.Interactive.Async" Version="3.1.1" />
   </ItemGroup>
 </Project>

src/Discord.Net.Rest/ClientHelper.cs

@@ -144,9 +144,14 @@ namespace Discord.Rest
         public static async Task<RestGuildUser> 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;
         }