Browse Source

Restrict typereaders to using the cache

tags/1.0-rc
RogueException 8 years ago
parent
commit
8ab675e775
2 changed files with 9 additions and 9 deletions
  1. +3
    -3
      src/Discord.Net.Commands/Readers/ChannelTypeReader.cs
  2. +6
    -6
      src/Discord.Net.Commands/Readers/UserTypeReader.cs

+ 3
- 3
src/Discord.Net.Commands/Readers/ChannelTypeReader.cs View File

@@ -14,16 +14,16 @@ namespace Discord.Commands
if (context.Guild != null) if (context.Guild != null)
{ {
var results = new Dictionary<ulong, TypeReaderValue>(); var results = new Dictionary<ulong, TypeReaderValue>();
var channels = await context.Guild.GetChannelsAsync().ConfigureAwait(false);
var channels = await context.Guild.GetChannelsAsync(CacheMode.CacheOnly).ConfigureAwait(false);
ulong id; ulong id;


//By Mention (1.0) //By Mention (1.0)
if (MentionUtils.TryParseChannel(input, out id)) if (MentionUtils.TryParseChannel(input, out id))
AddResult(results, await context.Guild.GetChannelAsync(id).ConfigureAwait(false) as T, 1.00f);
AddResult(results, await context.Guild.GetChannelAsync(id, CacheMode.CacheOnly).ConfigureAwait(false) as T, 1.00f);


//By Id (0.9) //By Id (0.9)
if (ulong.TryParse(input, NumberStyles.None, CultureInfo.InvariantCulture, out id)) if (ulong.TryParse(input, NumberStyles.None, CultureInfo.InvariantCulture, out id))
AddResult(results, await context.Guild.GetChannelAsync(id).ConfigureAwait(false) as T, 0.90f);
AddResult(results, await context.Guild.GetChannelAsync(id, CacheMode.CacheOnly).ConfigureAwait(false) as T, 0.90f);


//By Name (0.7-0.8) //By Name (0.7-0.8)
foreach (var channel in channels.Where(x => string.Equals(input, x.Name, StringComparison.OrdinalIgnoreCase))) foreach (var channel in channels.Where(x => string.Equals(input, x.Name, StringComparison.OrdinalIgnoreCase)))


+ 6
- 6
src/Discord.Net.Commands/Readers/UserTypeReader.cs View File

@@ -13,29 +13,29 @@ namespace Discord.Commands
public override async Task<TypeReaderResult> Read(CommandContext context, string input) public override async Task<TypeReaderResult> Read(CommandContext context, string input)
{ {
var results = new Dictionary<ulong, TypeReaderValue>(); var results = new Dictionary<ulong, TypeReaderValue>();
IReadOnlyCollection<IUser> channelUsers = (await context.Channel.GetUsersAsync().Flatten().ConfigureAwait(false)).ToArray(); //TODO: must be a better way?
IReadOnlyCollection<IUser> channelUsers = (await context.Channel.GetUsersAsync(CacheMode.CacheOnly).Flatten().ConfigureAwait(false)).ToArray(); //TODO: must be a better way?
IReadOnlyCollection<IGuildUser> guildUsers = null; IReadOnlyCollection<IGuildUser> guildUsers = null;
ulong id; ulong id;


if (context.Guild != null) if (context.Guild != null)
guildUsers = await context.Guild.GetUsersAsync().ConfigureAwait(false);
guildUsers = await context.Guild.GetUsersAsync(CacheMode.CacheOnly).ConfigureAwait(false);


//By Mention (1.0) //By Mention (1.0)
if (MentionUtils.TryParseUser(input, out id)) if (MentionUtils.TryParseUser(input, out id))
{ {
if (context.Guild != null) if (context.Guild != null)
AddResult(results, await context.Guild.GetUserAsync(id).ConfigureAwait(false) as T, 1.00f);
AddResult(results, await context.Guild.GetUserAsync(id, CacheMode.CacheOnly).ConfigureAwait(false) as T, 1.00f);
else else
AddResult(results, await context.Channel.GetUserAsync(id).ConfigureAwait(false) as T, 1.00f);
AddResult(results, await context.Channel.GetUserAsync(id, CacheMode.CacheOnly).ConfigureAwait(false) as T, 1.00f);
} }


//By Id (0.9) //By Id (0.9)
if (ulong.TryParse(input, NumberStyles.None, CultureInfo.InvariantCulture, out id)) if (ulong.TryParse(input, NumberStyles.None, CultureInfo.InvariantCulture, out id))
{ {
if (context.Guild != null) if (context.Guild != null)
AddResult(results, await context.Guild.GetUserAsync(id).ConfigureAwait(false) as T, 0.90f);
AddResult(results, await context.Guild.GetUserAsync(id, CacheMode.CacheOnly).ConfigureAwait(false) as T, 0.90f);
else else
AddResult(results, await context.Channel.GetUserAsync(id).ConfigureAwait(false) as T, 0.90f);
AddResult(results, await context.Channel.GetUserAsync(id, CacheMode.CacheOnly).ConfigureAwait(false) as T, 0.90f);
} }


//By Username + Discriminator (0.7-0.85) //By Username + Discriminator (0.7-0.85)


Loading…
Cancel
Save