Merge pull request #3 from sitegeist/mficzel-ignore-last-modication

BUGFIX: Ignore lastModification in favor of creation and publicationDates ZombieDetector.php
sitegeist · Jul 1, 2024 · 2070028 · 2070028
2 parents 7d179ca + e31fc03
commit 2070028
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/Classes/Domain/ZombieDetector.php b/Classes/Domain/ZombieDetector.php
@@ -29,17 +29,17 @@ public function isZombie(NodeInterface $node): bool
 
         $latestAllowedTimestamp = time() - $this->zombificationPeriod;
 
-        /** @var \DateTime|null $lastModificationDateTime */
-        $lastModificationDateTime = $node->getNodeData()->getLastModificationDateTime();
-        $lastModificationTimestamp = $lastModificationDateTime?->getTimestamp();
-
         /** @var \DateTime|null $lastPublicationDateTime */
         $lastPublicationDateTime = $node->getNodeData()->getLastPublicationDateTime();
         $lastPublicationTimestamp = $lastPublicationDateTime?->getTimestamp();
 
+        /** @var \DateTime|null $creationDateTime */
+        $creationDateTime = $node->getNodeData()->getCreationDateTime();
+        $creationTimestamp = $creationDateTime?->getTimestamp();
+
         if (
-            ($lastModificationTimestamp === null || $lastModificationTimestamp < $latestAllowedTimestamp)
-            && ($lastPublicationTimestamp === null || $lastPublicationTimestamp < $latestAllowedTimestamp)
+            ($lastPublicationTimestamp !== null && $lastPublicationTimestamp < $latestAllowedTimestamp)
+            || ($lastPublicationTimestamp === null && $creationTimestamp < $latestAllowedTimestamp)
         ) {
             return true;
         }
@@ -55,18 +55,17 @@ public function isZombieThatHasToBeDestroyed(NodeInterface $node): bool
 
         $latestAllowedTimestamp = time() - $this->zombificationPeriod - $this->destructionPeriod;
 
-        /** @var \DateTime|null $lastModificationDateTime */
-        $lastModificationDateTime = $node->getNodeData()->getLastModificationDateTime();
-        $lastModificationTimestamp = $lastModificationDateTime?->getTimestamp();
-
         /** @var \DateTime|null $lastPublicationDateTime */
         $lastPublicationDateTime = $node->getNodeData()->getLastPublicationDateTime();
         $lastPublicationTimestamp = $lastPublicationDateTime?->getTimestamp();
 
+        /** @var \DateTime|null $creationDateTime */
+        $creationDateTime = $node->getNodeData()->getCreationDateTime();
+        $creationTimestamp = $creationDateTime?->getTimestamp();
+
         if (
-            $node->isVisible() === false
-            && ($lastModificationTimestamp === null || $lastModificationTimestamp < $latestAllowedTimestamp)
-            && ($lastPublicationTimestamp === null || $lastPublicationTimestamp < $latestAllowedTimestamp)
+            ($lastPublicationTimestamp !== null && $lastPublicationTimestamp < $latestAllowedTimestamp)
+            || ($lastPublicationTimestamp === null && $creationTimestamp < $latestAllowedTimestamp)
         ) {
             return true;
         }