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

Fixed relative id when retrieving >100 channel message requests.

Browse Source
This commit is contained in:
RogueException
2016-07-12 07:38:37 -03:00
parent 551b60d9b1
commit ee04e1ddcc
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Discord.Net/API/DiscordAPIClient.cs
View File

@@ -918,8 +918,19 @@ namespace Discord.API
//Was this an empty batch? //Was this an empty batch?
if (models.Length == 0) break; if (models.Length == 0) break;
result[i] = models; switch (args.RelativeDirection)
relativeId = args.RelativeDirection == Direction.Before ? models[0].Id : models[models.Length - 1].Id; {
case Direction.Before:
case Direction.Around:
default:
result[i] = models;
relativeId = models[models.Length - 1].Id;
break;
case Direction.After:
result[runs - i - 1] = models;
relativeId = models[0].Id;
break;
}
//Was this an incomplete (the last) batch? //Was this an incomplete (the last) batch?
if (models.Length != DiscordConfig.MaxMessagesPerBatch) { i++; break; } if (models.Length != DiscordConfig.MaxMessagesPerBatch) { i++; break; }
@@ -927,10 +938,15 @@ namespace Discord.API
if (i > 1) if (i > 1)
{ {
if (args.RelativeDirection == Direction.Before) switch (args.RelativeDirection)
return result.Take(i).SelectMany(x => x).ToImmutableArray(); {
else case Direction.Before:
return result.Take(i).Reverse().SelectMany(x => x).ToImmutableArray(); case Direction.Around:
default:
return result.Take(i).SelectMany(x => x).ToImmutableArray();
case Direction.After:
return result.Skip(runs - i).Take(i).SelectMany(x => x).ToImmutableArray();
}
} }
else if (i == 1) else if (i == 1)
return result[0]; return result[0];