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

Improved GetMessages with cache enabled

Browse Source
This commit is contained in:
RogueException
2016-10-06 05:37:45 -03:00
parent bb1fc2c42a
commit 0b47d5bd2e
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Discord.Net.WebSocket/Entities/Channels/SocketChannelHelper.cs
View File

@@ -11,26 +11,43 @@ namespace Discord.WebSocket
public static IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(SocketChannel channel, DiscordSocketClient discord, MessageCache messages, public static IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(SocketChannel channel, DiscordSocketClient discord, MessageCache messages,
ulong? fromMessageId, Direction dir, int limit, CacheMode mode, RequestOptions options) ulong? fromMessageId, Direction dir, int limit, CacheMode mode, RequestOptions options)
{ {
IReadOnlyCollection<SocketMessage> cachedMessages; if (dir == Direction.Around)
IAsyncEnumerable<IReadOnlyCollection<IMessage>> result; throw new NotImplementedException(); //TODO: Impl
IReadOnlyCollection<SocketMessage> cachedMessages = null;
IAsyncEnumerable<IReadOnlyCollection<IMessage>> result = null;
if (dir == Direction.After && fromMessageId == null)
return AsyncEnumerable.Empty<IReadOnlyCollection<IMessage>>();
if (dir == Direction.Before || mode == CacheMode.CacheOnly)
{
if (messages != null) //Cache enabled if (messages != null) //Cache enabled
cachedMessages = messages.GetMany(fromMessageId, dir, limit); cachedMessages = messages.GetMany(fromMessageId, dir, limit);
else else
cachedMessages = ImmutableArray.Create<SocketMessage>(); cachedMessages = ImmutableArray.Create<SocketMessage>();
result = ImmutableArray.Create(cachedMessages).ToAsyncEnumerable<IReadOnlyCollection<IMessage>>(); result = ImmutableArray.Create(cachedMessages).ToAsyncEnumerable<IReadOnlyCollection<IMessage>>();
}
if (dir == Direction.Before)
{
limit -= cachedMessages.Count; limit -= cachedMessages.Count;
if (mode == CacheMode.CacheOnly || limit <= 0) if (mode == CacheMode.CacheOnly || limit <= 0)
return result; return result;
if (dir == Direction.Before) //Download remaining messages
fromMessageId = cachedMessages.Min(x => x.Id); var downloadedMessages = ChannelHelper.GetMessagesAsync(channel, discord, cachedMessages.Min(x => x.Id), dir, limit, options);
else
fromMessageId = cachedMessages.Max(x => x.Id);
var downloadedMessages = ChannelHelper.GetMessagesAsync(channel, discord, fromMessageId, dir, limit, options);
return result.Concat(downloadedMessages); return result.Concat(downloadedMessages);
} }
else
{
if (mode == CacheMode.CacheOnly)
return result;
//Dont use cache in this case
return ChannelHelper.GetMessagesAsync(channel, discord, fromMessageId, dir, limit, options);
}
}
public static IReadOnlyCollection<SocketMessage> GetCachedMessages(SocketChannel channel, DiscordSocketClient discord, MessageCache messages, public static IReadOnlyCollection<SocketMessage> GetCachedMessages(SocketChannel channel, DiscordSocketClient discord, MessageCache messages,
ulong? fromMessageId, Direction dir, int limit) ulong? fromMessageId, Direction dir, int limit)
{ {