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

Dont do cache lookups when the cache parameter for DownloadMessages is false.

Browse Source
This commit is contained in:
RogueException
2015-11-16 16:24:51 -04:00
parent 338fa86d75
commit bfdfc5623e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -223,6 +223,8 @@ namespace Discord
if (count < 0) throw new ArgumentNullException(nameof(count)); if (count < 0) throw new ArgumentNullException(nameof(count));
CheckReady(); CheckReady();
bool trackActivity = Config.TrackActivity;
if (count == 0) return new Message[0]; if (count == 0) return new Message[0];
if (channel != null && channel.Type == ChannelType.Text) if (channel != null && channel.Type == ChannelType.Text)
{ {
@@ -233,21 +235,20 @@ namespace Discord
{ {
Message msg = null; Message msg = null;
if (cache) if (cache)
{
msg = _messages.GetOrAdd(x.Id, x.ChannelId, x.Author.Id); msg = _messages.GetOrAdd(x.Id, x.ChannelId, x.Author.Id);
else if (trackActivity)
{
msg = _messages[x.Id] ?? new Message(this, x.Id, x.ChannelId, x.Author.Id);
msg.Update(x); //TODO: Look into updating when cache is true, but only if we actually generated a new message.
}
if (Config.TrackActivity)
{
if (!channel.IsPrivate)
{ {
var user = msg.User; var user = msg.User;
if (user != null) if (user != null)
user.UpdateActivity(msg.EditedTimestamp ?? msg.Timestamp); user.UpdateActivity(msg.EditedTimestamp ?? msg.Timestamp);
} }
} }
else
{
msg = /*_messages[x.Id] ??*/ new Message(this, x.Id, x.ChannelId, x.Author.Id);
msg.Update(x);
}
return msg; return msg;
}) })
.ToArray(); .ToArray();