From ea489dc95591b2b8961bc9435ea9d47b21ab7237 Mon Sep 17 00:00:00 2001 From: Paulo Date: Sat, 1 Jul 2017 08:39:42 -0300 Subject: [PATCH 1/2] Bugfix: HttpException 403 --- src/Discord.Addons.Paginator/PaginationService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Addons.Paginator/PaginationService.cs b/src/Discord.Addons.Paginator/PaginationService.cs index a27abd3..d96711f 100644 --- a/src/Discord.Addons.Paginator/PaginationService.cs +++ b/src/Discord.Addons.Paginator/PaginationService.cs @@ -85,7 +85,6 @@ internal async Task OnReactionAdded(Cacheable messageParam, var _ = message.RemoveReactionAsync(reaction.Emote, reaction.User.Value); return; } - await message.RemoveReactionAsync(reaction.Emote, reaction.User.Value); await WriteLog(Log.Debug($"Handled reaction {reaction.Emote} from user {reaction.UserId}")); if (reaction.Emote.Name == page.Options.EmoteFirst.Name) { @@ -127,6 +126,7 @@ internal async Task OnReactionAdded(Cacheable messageParam, await message.RemoveAllReactionsAsync(); _messages.Remove(message.Id); } + await message.RemoveReactionAsync(reaction.Emote, reaction.User.Value); } } } From f27905861ece777fc09e6ef2c952c0e089c2eb12 Mon Sep 17 00:00:00 2001 From: Paulo Date: Sat, 1 Jul 2017 09:59:38 -0300 Subject: [PATCH 2/2] Just to be sure --- src/Discord.Addons.Paginator/PaginationService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Discord.Addons.Paginator/PaginationService.cs b/src/Discord.Addons.Paginator/PaginationService.cs index d96711f..f31a614 100644 --- a/src/Discord.Addons.Paginator/PaginationService.cs +++ b/src/Discord.Addons.Paginator/PaginationService.cs @@ -52,11 +52,11 @@ public async Task SendPaginatedMessageAsync(IMessageChannel channe var _ = Task.Delay(paginated.Options.Timeout).ContinueWith(async _t => { if (!_messages.ContainsKey(message.Id)) return; + _messages.Remove(message.Id); if (paginated.Options.TimeoutAction == StopAction.DeleteMessage) await message.DeleteAsync(); else if (paginated.Options.TimeoutAction == StopAction.ClearReactions) await message.RemoveAllReactionsAsync(); - _messages.Remove(message.Id); }); } @@ -120,11 +120,11 @@ internal async Task OnReactionAdded(Cacheable messageParam, } else if (reaction.Emote.Name == page.Options.EmoteStop.Name) { + _messages.Remove(message.Id); if (page.Options.EmoteStopAction == StopAction.DeleteMessage) await message.DeleteAsync(); else if (page.Options.EmoteStopAction == StopAction.ClearReactions) await message.RemoveAllReactionsAsync(); - _messages.Remove(message.Id); } await message.RemoveReactionAsync(reaction.Emote, reaction.User.Value); }