From 94756faa5db181c285a1e439f788e4dde3ee9653 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Mon, 14 Oct 2019 01:10:32 +0300 Subject: [PATCH] Fix !clean sometimes cleaning too many messages --- src/plugins/Utility.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/Utility.ts b/src/plugins/Utility.ts index 46b0cb97..680a9d7f 100644 --- a/src/plugins/Utility.ts +++ b/src/plugins/Utility.ts @@ -618,8 +618,10 @@ export class UtilityPlugin extends ZeppelinPlugin { if (moment.utc(message.posted_at).valueOf() < timeCutoff) return false; return true; }); + const remaining = args.count - messagesToClean.length; + const withoutOverflow = filtered.slice(0, remaining); + messagesToClean.push(...withoutOverflow); - messagesToClean.push(...filtered); beforeId = potentialMessagesToClean[potentialMessagesToClean.length - 1].id; if (moment.utc(potentialMessagesToClean[potentialMessagesToClean.length - 1].posted_at).valueOf() < timeCutoff) {