From 66d8ded92488b5ac5321f47e6a3a8588ebc0309e Mon Sep 17 00:00:00 2001 From: renebulous Date: Mon, 4 Dec 2017 10:30:41 +0800 Subject: [PATCH] Fixed cleanup pulling more logs than required. (#1128) Added conditional statement to break loop once number of messages to be deleted has been reached. --- redbot/cogs/cleanup/cleanup.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/redbot/cogs/cleanup/cleanup.py b/redbot/cogs/cleanup/cleanup.py index 8b10061fc..67bb8b3d6 100644 --- a/redbot/cogs/cleanup/cleanup.py +++ b/redbot/cogs/cleanup/cleanup.py @@ -63,6 +63,8 @@ class Cleanup: elif (ctx.message.created_at - message.created_at).days >= 14: too_old = True break + elif len(to_delete) >= number: + break tmp = message reason = "{}({}) deleted {} messages "\ @@ -112,6 +114,8 @@ class Cleanup: elif (ctx.message.created_at - message.created_at).days >= 14: too_old = True break + elif len(to_delete) >= number: + break tmp = message reason = "{}({}) deleted {} messages "\ " made by {}({}) in channel {}"\ @@ -252,6 +256,8 @@ class Cleanup: elif (ctx.message.created_at - message.created_at).days >= 14: too_old = True break + elif len(to_delete) >= number: + break tmp = message reason = "{}({}) deleted {} "\ @@ -326,6 +332,8 @@ class Cleanup: # Found a message that is 14 or more days old, stop here too_old = True break + elif len(to_delete) >= number: + break tmp = message if channel.name: