Merge branch 'master' of https://github.com/x89/Shreddit

8 years ago · 9c09e1d14e
parent d8e4a75ec8 27b50f6f2f
commit 9c09e1d14e
1 changed files with 5 additions and 5 deletions
--- a/shreddit/shredder.py
+++ b/shreddit/shredder.py
@ -151,13 +151,13 @@ class Shredder(object):
                self._logger.debug("Deleting due to blacklist")
                count_removed += 1
                self._remove(item)
-            elif self._check_whitelist(item):
-                self._logger.debug("Skipping due to: whitelisted")
-                continue
-            if created <= self._nuke_cutoff:
+            elif created <= self._nuke_cutoff:
                self._logger.debug("Item occurs prior to nuke cutoff")
                count_removed += 1
                self._remove(item)
+            elif self._check_whitelist(item):
+                self._logger.debug("Skipping due to: whitelisted")
+                continue
 	    elif created > self._recent_cutoff:
                self._logger.debug("Skipping due to: too recent")
                continue