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

DownloadMessages shouldn't pop newer messages out of the message cache when downloading older ones.

Browse Source
This commit is contained in:
RogueException
2015-11-16 16:17:22 -04:00
parent 1e21462eb5
commit 338fa86d75
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net/DiscordClient.Messages.cs
View File

@@ -217,7 +217,7 @@ namespace Discord
/// <summary> Downloads last count messages from the server, returning all messages before or after relativeMessageId, if it's provided. </summary> /// <summary> Downloads last count messages from the server, returning all messages before or after relativeMessageId, if it's provided. </summary>
public async Task<Message[]> DownloadMessages(Channel channel, int count, string relativeMessageId = null, RelativeDirection relativeDir = RelativeDirection.Before, bool cache = false) public async Task<Message[]> DownloadMessages(Channel channel, int count, string relativeMessageId = null, RelativeDirection relativeDir = RelativeDirection.Before, bool cache = true)
{ {
if (channel == null) throw new ArgumentNullException(nameof(channel)); if (channel == null) throw new ArgumentNullException(nameof(channel));
if (count < 0) throw new ArgumentNullException(nameof(count)); if (count < 0) throw new ArgumentNullException(nameof(count));

3
src/Discord.Net/Models/Channel.cs
View File

@@ -140,10 +140,11 @@ namespace Discord
internal void AddMessage(Message message) internal void AddMessage(Message message)
{ {
//Race conditions are okay here - it just means the queue will occasionally go higher than the requested cache size, and fixed later.
var cacheLength = _client.Config.MessageCacheLength; var cacheLength = _client.Config.MessageCacheLength;
if (cacheLength > 0) if (cacheLength > 0)
{ {
var oldestIds = _messages.Select(x => x.Value.Id).OrderBy(x => x).Take(_messages.Count - cacheLength); var oldestIds = _messages.Where(x => x.Value.Timestamp < message.Timestamp).Select(x => x.Key).OrderBy(x => x).Take(_messages.Count - cacheLength);
foreach (var id in oldestIds) foreach (var id in oldestIds)
{ {
Message removed; Message removed;