From fb8e4430ac8da7829b402f23ad73c62308981498 Mon Sep 17 00:00:00 2001 From: bobloy Date: Mon, 16 Apr 2018 15:51:01 -0400 Subject: [PATCH] [V3] Fix Cleanup loop (#1533) * prevent infinite loop * pep8 updates Assorted pep8 updates to retrigger Travis * Revert "pep8 updates" This reverts commit d0c7f8b8089774f5108e5eb6db385aacb1df7ecb. --- redbot/cogs/cleanup/cleanup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/redbot/cogs/cleanup/cleanup.py b/redbot/cogs/cleanup/cleanup.py index d1d5db83a..869c27955 100644 --- a/redbot/cogs/cleanup/cleanup.py +++ b/redbot/cogs/cleanup/cleanup.py @@ -55,6 +55,7 @@ class Cleanup: too_old = False while not too_old and len(to_delete) - 1 < number: + message = None async for message in channel.history(limit=limit, before=before, after=after): @@ -66,6 +67,9 @@ class Cleanup: break elif number and len(to_delete) >= number: break + if message is None: + break + else: before = message return to_delete