From e819eace34038c82a93821c628d915687d0c8477 Mon Sep 17 00:00:00 2001 From: HelpfulStranger999 Date: Sun, 8 Apr 2018 15:16:42 -0500 Subject: [PATCH] Further amendment based on review --- src/Discord.Net.Rest/DiscordRestApiClient.cs | 4 ++-- src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Discord.Net.Rest/DiscordRestApiClient.cs b/src/Discord.Net.Rest/DiscordRestApiClient.cs index 6bef7f75f..42945c37f 100644 --- a/src/Discord.Net.Rest/DiscordRestApiClient.cs +++ b/src/Discord.Net.Rest/DiscordRestApiClient.cs @@ -622,8 +622,8 @@ namespace Discord.API Preconditions.GreaterThan(args.AfterUserId, 0, nameof(args.AfterUserId)); options = RequestOptions.CreateOrClone(options); - var limit = args.Limit.GetValueOrDefault(DiscordConfig.MaxUserReactionsPerBatch); - var afterUserId = args.AfterUserId.GetValueOrDefault(0); + int limit = args.Limit.GetValueOrDefault(DiscordConfig.MaxUserReactionsPerBatch); + ulong afterUserId = args.AfterUserId.GetValueOrDefault(0); var ids = new BucketIds(channelId: channelId); Expression> endpoint = () => $"channels/{channelId}/messages/{messageId}/reactions/{emoji}?limit={limit}&after={afterUserId}"; diff --git a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs index db6dd69e8..0bda69186 100644 --- a/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs +++ b/src/Discord.Net.Rest/Entities/Messages/MessageHelper.cs @@ -60,7 +60,7 @@ namespace Discord.Rest async (info, ct) => { var args = new GetReactionUsersParams(); - func(args); + args.Limit = info.PageSize; if (info.Position != null) args.AfterUserId = info.Position.Value; @@ -81,8 +81,8 @@ namespace Discord.Rest info.Position = lastPage.Max(x => x.Id); return true; }, - start: arguments.AfterUserId.Value, - count: arguments.Limit.Value + start: arguments.AfterUserId.IsSpecified ? arguments.AfterUserId.Value : (ulong?)null, + count: arguments.Limit.GetValueOrDefault(DiscordConfig.MaxUserReactionsPerBatch) ); }