Merge branch 'dev' of https://github.com/discord-net/Discord.Net into…

… dev
discord-net · Jan 30, 2022 · e19ad28 · e19ad28
2 parents fddaac9 + 09eb9fa
commit e19ad28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Discord.Net.WebSocket/DiscordSocketClient.cs b/src/Discord.Net.WebSocket/DiscordSocketClient.cs
@@ -2913,6 +2913,9 @@ internal void EnsureGatewayIntent(GatewayIntents intents)
             }
         }
 
+        internal bool HasGatewayIntent(GatewayIntents intents)
+            => _gatewayIntents.HasFlag(intents);
+
         private async Task GuildAvailableAsync(SocketGuild guild)
         {
             if (!guild.IsConnected)

diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs
@@ -119,7 +119,8 @@ public virtual async Task<SocketThreadChannel> CreateThreadAsync(string name, Th
 
             var thread = (SocketThreadChannel)Guild.AddOrUpdateChannel(Discord.State, model);
 
-            await thread.DownloadUsersAsync();
+            if(Discord.AlwaysDownloadUsers && Discord.HasGatewayIntent(GatewayIntents.GuildMembers))
+                await thread.DownloadUsersAsync();
 
             return thread;
         }