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

Several GetMessages fixes

Browse Source
This commit is contained in:
RogueException
2016-05-15 15:13:31 -03:00
parent 7b68b4a860
commit a59bfaaeff
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Discord.Net/API/DiscordRawClient.cs
View File

@@ -582,29 +582,28 @@ namespace Discord.API
if (args.Limit <= 0) throw new ArgumentOutOfRangeException(nameof(args.Limit)); if (args.Limit <= 0) throw new ArgumentOutOfRangeException(nameof(args.Limit));
int limit = args.Limit; int limit = args.Limit;
ulong? relativeId = args.RelativeMessageId; ulong? relativeId = args.RelativeMessageId.IsSpecified ? args.RelativeMessageId.Value : (ulong?)null;
string relativeDir = args.RelativeDirection == Direction.After ? "after" : "before"; string relativeDir = args.RelativeDirection == Direction.After ? "after" : "before";
int runs = limit / DiscordConfig.MaxMessagesPerBatch; int runs = limit / DiscordConfig.MaxMessagesPerBatch;
int lastRunCount = limit - runs * DiscordConfig.MaxMessagesPerBatch; int lastRunCount = limit - (runs - 1) * DiscordConfig.MaxMessagesPerBatch;
var result = new API.Message[runs][]; var result = new API.Message[runs][];
int i = 0; int i = 0;
for (; i < runs; i++) for (; i < runs; i++)
{ {
int runCount = i == (runs - 1) ? lastRunCount : DiscordConfig.MaxMessagesPerBatch;
string endpoint; string endpoint;
if (relativeId != null) if (relativeId != null)
endpoint = $"channels/{channelId}/messages?limit={limit}&{relativeDir}={relativeId}"; endpoint = $"channels/{channelId}/messages?limit={runCount}&{relativeDir}={relativeId}";
else else
endpoint = $"channels/{channelId}/messages?limit={limit}"; endpoint = $"channels/{channelId}/messages?limit={runCount}";
var models = await Send<Message[]>("GET", endpoint).ConfigureAwait(false); var models = await Send<Message[]>("GET", endpoint).ConfigureAwait(false);
//Was this an empty batch? //Was this an empty batch?
if (models.Length == 0) break; if (models.Length == 0) break;
result[i] = models; result[i] = models;
limit = (i == runs - 1) ? lastRunCount : DiscordConfig.MaxMessagesPerBatch;
relativeId = args.RelativeDirection == Direction.Before ? models[0].Id : models[models.Length - 1].Id; relativeId = args.RelativeDirection == Direction.Before ? models[0].Id : models[models.Length - 1].Id;
//Was this an incomplete (the last) batch? //Was this an incomplete (the last) batch?
@@ -612,7 +611,12 @@ namespace Discord.API
} }
if (i > 1) if (i > 1)
return result.Take(i).SelectMany(x => x); {
if (args.RelativeDirection == Direction.Before)
return result.Take(i).SelectMany(x => x);
else
return result.Take(i).Reverse().SelectMany(x => x);
}
else if (i == 1) else if (i == 1)
return result[0]; return result[0];
else else

3
src/Discord.Net/API/Rest/CreateGuildParams.cs
View File

@@ -1,5 +1,4 @@
using Discord.Net.Converters; using Newtonsoft.Json;
using Newtonsoft.Json;
using System.IO; using System.IO;
namespace Discord.API.Rest namespace Discord.API.Rest