From 763bfc08bcc036d8ee464d254ba9e4ce5376f008 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Tue, 11 Apr 2017 00:46:02 +0200 Subject: [PATCH] prune bugfixes --- src/NadekoBot/Modules/Administration/Administration.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 71f20464..0e175083 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -392,13 +392,18 @@ namespace NadekoBot.Modules.Administration [RequireContext(ContextType.Guild)] [RequireUserPermission(ChannelPermission.ManageMessages)] [RequireBotPermission(GuildPermission.ManageMessages)] + [Priority(0)] public async Task Prune(int count) { if (count < 1) return; await Context.Message.DeleteAsync().ConfigureAwait(false); - int limit = (count < 100) ? count : 100; + int limit = (count < 100) ? count + 1 : 100; var enumerable = (await Context.Channel.GetMessagesAsync(limit: limit).Flatten().ConfigureAwait(false)); + if (enumerable.FirstOrDefault()?.Id == Context.Message.Id) + enumerable = enumerable.Skip(1).ToArray(); + else + enumerable = enumerable.Take(count); await Context.Channel.DeleteMessagesAsync(enumerable).ConfigureAwait(false); } @@ -407,6 +412,7 @@ namespace NadekoBot.Modules.Administration [RequireContext(ContextType.Guild)] [RequireUserPermission(ChannelPermission.ManageMessages)] [RequireBotPermission(GuildPermission.ManageMessages)] + [Priority(1)] public async Task Prune(IGuildUser user, int count = 100) { if (count < 1)