fix: use async instead of blocking the thread and allow for the use of the cache

Author: OMEGA3065

src/Discord.Net.Rest/DiscordRestApiClient.cs

@@ -1741,13 +1741,13 @@ public async Task<GuildMessageSearchData> GetGuildMessagesAsync(ulong guildId, G
             Preconditions.AtMost(args.Limit, DiscordConfig.MaxGuildMessageSearchLimit, nameof(args.Limit));
             Preconditions.AtMost(args.Offset, DiscordConfig.MaxGuildMessageSearchOffset, nameof(args.Offset));
             Preconditions.AtMost(args.Slop, DiscordConfig.MaxGuildMessageSearchSlop, nameof(args.Slop));
-            Preconditions.AtMostSize(args.Content, DiscordConfig.MaxGuildMessageSearchContentLength, nameof(args.Content));
-            Preconditions.AtMostSize(args.ChannelIds, DiscordConfig.MaxGuildMessageSearchChannels, nameof(args.ChannelIds));
-            Preconditions.AtMostSize(args.AuthorIds, DiscordConfig.MaxGuildMessageSearchAuthors, nameof(args.AuthorIds));
-            Preconditions.AtMostSize(args.UserMentionIds, DiscordConfig.MaxGuildMessageSearchUserMentions, nameof(args.UserMentionIds));
-            Preconditions.AtMostSize(args.RoleMentionIds, DiscordConfig.MaxGuildMessageSearchRoleMentions, nameof(args.RoleMentionIds));
-            Preconditions.AtMostSize(args.RepliedToUserIds, DiscordConfig.MaxGuildMessageSearchReplyUserIds, nameof(args.RepliedToUserIds));
-            Preconditions.AtMostSize(args.RepliedToMessageIds, DiscordConfig.MaxGuildMessageSearchReplyMessageIds, nameof(args.RepliedToMessageIds));
+            Preconditions.AtMostLength(args.Content, DiscordConfig.MaxGuildMessageSearchContentLength, nameof(args.Content));
+            Preconditions.AtMostLength(args.ChannelIds, DiscordConfig.MaxGuildMessageSearchChannels, nameof(args.ChannelIds));
+            Preconditions.AtMostLength(args.AuthorIds, DiscordConfig.MaxGuildMessageSearchAuthors, nameof(args.AuthorIds));
+            Preconditions.AtMostLength(args.UserMentionIds, DiscordConfig.MaxGuildMessageSearchUserMentions, nameof(args.UserMentionIds));
+            Preconditions.AtMostLength(args.RoleMentionIds, DiscordConfig.MaxGuildMessageSearchRoleMentions, nameof(args.RoleMentionIds));
+            Preconditions.AtMostLength(args.RepliedToUserIds, DiscordConfig.MaxGuildMessageSearchReplyUserIds, nameof(args.RepliedToUserIds));
+            Preconditions.AtMostLength(args.RepliedToMessageIds, DiscordConfig.MaxGuildMessageSearchReplyMessageIds, nameof(args.RepliedToMessageIds));
 
             options = RequestOptions.CreateOrClone(options);
 
@@ -1809,8 +1809,6 @@ public async Task<GuildMessageSearchData> GetGuildMessagesAsync(ulong guildId, G
             if (args.IncludeNsfw.IsSpecified)
                 endpointQueryParams.Append($"&include_nsfw={(args.IncludeNsfw.Value ? "true" : "false")}");
 
-            Console.WriteLine($"ENDPOINT: guilds/{guildId}/messages/search?{endpointQueryParams}");
-
             var ids = new BucketIds(guildId: guildId);
             Expression<Func<string>> endpoint = () => $"guilds/{guildId}/messages/search?{endpointQueryParams}";
 

src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs

@@ -185,12 +185,9 @@ public static async Task<GuildMessageSearchData> GetGuildMessagesAsync(IGuild gu
 
             var builder = ImmutableArray.CreateBuilder<RestMessage>();
             if (model.ParseMessages)
-                foreach (var msg in model.Messages)
-                {
-                    var author = MessageHelper.GetAuthor(client, guild, msg.Author.Value, msg.WebhookId.ToNullable());
-                    var channel = GetChannelAsync(guild, client, msg.ChannelId, options).Result;
-                    builder.Add(RestMessage.Create(client, channel as IMessageChannel, author, msg));
-                }
+                builder.AddRange(await Task.WhenAll(
+                    model.Messages.Select(ParseMessage)
+                ));
 
             return new GuildMessageSearchData
             {
@@ -199,6 +196,19 @@ public static async Task<GuildMessageSearchData> GetGuildMessagesAsync(IGuild gu
                 TotalResults = model.TotalResults,
                 Messages = builder.ToImmutable(),
             };
+
+            async Task<RestMessage> ParseMessage(Message msg)
+            {
+                var authorTask = guild.GetUserAsync(msg.Author.Value.Id, options: options);
+                var channelTask = guild.GetChannelAsync(msg.ChannelId, options: options);
+
+                await Task.WhenAll(authorTask, channelTask);
+
+                var author = await authorTask;
+                var channel = await channelTask;
+
+                return RestMessage.Create(client, channel as IMessageChannel, author, msg);
+            }
         }
 
         #endregion