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

Fixed OOB error in MessageCache.Download

Browse Source
This commit is contained in:
RogueException
2016-06-12 17:08:15 -03:00
parent be354f5614
commit 6adb6b1882
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Discord.Net/Utilities/MessageCache.cs → src/Discord.Net/Entities/WebSocket/MessageCache.cs
View File

@@ -104,11 +104,16 @@ namespace Discord
return cachedMessages.Skip(cachedMessages.Count - limit).ToImmutableArray(); return cachedMessages.Skip(cachedMessages.Count - limit).ToImmutableArray();
else else
{ {
Optional<ulong> relativeId;
if (cachedMessages.Count == 0)
relativeId = fromId ?? new Optional<ulong>();
else
relativeId = dir == Direction.Before ? cachedMessages[0].Id : cachedMessages[cachedMessages.Count - 1].Id;
var args = new GetChannelMessagesParams var args = new GetChannelMessagesParams
{ {
Limit = limit - cachedMessages.Count, Limit = limit - cachedMessages.Count,
RelativeDirection = dir, RelativeDirection = dir,
RelativeMessageId = dir == Direction.Before ? cachedMessages[0].Id : cachedMessages[cachedMessages.Count - 1].Id RelativeMessageId = relativeId
}; };
var downloadedMessages = await _discord.ApiClient.GetChannelMessagesAsync(_channel.Id, args).ConfigureAwait(false); var downloadedMessages = await _discord.ApiClient.GetChannelMessagesAsync(_channel.Id, args).ConfigureAwait(false);
return cachedMessages.Concat(downloadedMessages.Select(x => new CachedMessage(_channel, _channel.GetUser(x.Id), x))).ToImmutableArray(); return cachedMessages.Concat(downloadedMessages.Select(x => new CachedMessage(_channel, _channel.GetUser(x.Id), x))).ToImmutableArray();