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

Renamed DownloadAllMembers -> DownloadAllUsers, fixed overriding CachedGuild's DownloadUsers

Browse Source
This commit is contained in:
RogueException
2016-06-28 17:30:18 -03:00
parent 09572b0f76
commit 6d6af08815
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Discord.Net/DiscordSocketClient.cs
View File

@@ -362,11 +362,11 @@ namespace Discord
return DataStore.RemoveUser(id); return DataStore.RemoveUser(id);
} }
/// <summary> Downloads the members list for all large guilds. </summary> /// <summary> Downloads the users list for all large guilds. </summary>
public Task DownloadAllMembersAsync() public Task DownloadAllUsersAsync()
=> DownloadMembersAsync(DataStore.Guilds.Where(x => !x.HasAllMembers)); => DownloadUsersAsync(DataStore.Guilds.Where(x => !x.HasAllMembers));
/// <summary> Downloads the members list for the provided guilds, if they don't have a complete list. </summary> /// <summary> Downloads the users list for the provided guilds, if they don't have a complete list. </summary>
public async Task DownloadMembersAsync(IEnumerable<IGuild> guilds) public async Task DownloadUsersAsync(IEnumerable<IGuild> guilds)
{ {
const short batchSize = 50; const short batchSize = 50;
var cachedGuilds = guilds.Select(x => x as CachedGuild).ToArray(); var cachedGuilds = guilds.Select(x => x as CachedGuild).ToArray();
@@ -374,7 +374,7 @@ namespace Discord
return; return;
else if (cachedGuilds.Length == 1) else if (cachedGuilds.Length == 1)
{ {
await cachedGuilds[0].DownloadMembersAsync().ConfigureAwait(false); await cachedGuilds[0].DownloadUsersAsync().ConfigureAwait(false);
return; return;
} }

5
src/Discord.Net/Entities/Guilds/Guild.cs
View File

@@ -289,6 +289,10 @@ namespace Discord
model = await Discord.ApiClient.BeginGuildPruneAsync(Id, args).ConfigureAwait(false); model = await Discord.ApiClient.BeginGuildPruneAsync(Id, args).ConfigureAwait(false);
return model.Pruned; return model.Pruned;
} }
public virtual Task DownloadUsersAsync()
{
throw new NotSupportedException();
}
internal GuildChannel ToChannel(API.Channel model) internal GuildChannel ToChannel(API.Channel model)
{ {
@@ -311,7 +315,6 @@ namespace Discord
IRole IGuild.EveryoneRole => EveryoneRole; IRole IGuild.EveryoneRole => EveryoneRole;
IReadOnlyCollection<Emoji> IGuild.Emojis => Emojis; IReadOnlyCollection<Emoji> IGuild.Emojis => Emojis;
IReadOnlyCollection<string> IGuild.Features => Features; IReadOnlyCollection<string> IGuild.Features => Features;
Task IGuild.DownloadUsersAsync() { throw new NotSupportedException(); }
IAudioClient IGuild.AudioClient => null; IAudioClient IGuild.AudioClient => null;
IRole IGuild.GetRole(ulong id) => GetRole(id); IRole IGuild.GetRole(ulong id) => GetRole(id);

2
src/Discord.Net/Entities/WebSocket/CachedGuild.cs
View File

@@ -206,7 +206,7 @@ namespace Discord
return member; return member;
return null; return null;
} }
public async Task DownloadMembersAsync() public override async Task DownloadUsersAsync()
{ {
if (!HasAllMembers) if (!HasAllMembers)
await Discord.ApiClient.SendRequestMembersAsync(new ulong[] { Id }).ConfigureAwait(false); await Discord.ApiClient.SendRequestMembersAsync(new ulong[] { Id }).ConfigureAwait(false);