Forcibly generate the cache if not be cleared

putyourlightson · Oct 24, 2023 · 7ef3507 · 7ef3507
1 parent eb47a0c
commit 7ef3507
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changed
 
 - Changed the refreshable status check to always conside elements with `live` and `active` statuses as refreshable ([#572](https://github.com/putyourlightson/craft-blitz/issues/572)).
+- Refreshing expired cached now forcibly generates new cached pages if they are not cleared ([#573](https://github.com/putyourlightson/craft-blitz/issues/573)).
 
 ### Fixed
 

diff --git a/src/models/SettingsModel.php b/src/models/SettingsModel.php
@@ -460,8 +460,8 @@ public function clearOnRefresh(bool $force = false): bool
             return true;
         }
 
-        return $this->refreshMode == self::REFRESH_MODE_CLEAR
-            || $this->refreshMode == self::REFRESH_MODE_CLEAR_AND_GENERATE;
+        return $this->refreshMode === self::REFRESH_MODE_CLEAR
+            || $this->refreshMode === self::REFRESH_MODE_CLEAR_AND_GENERATE;
     }
 
     /**
@@ -479,8 +479,8 @@ public function generateOnRefresh(bool $force = false): bool
             return false;
         }
 
-        return $this->refreshMode == self::REFRESH_MODE_EXPIRE_AND_GENERATE
-            || $this->refreshMode == self::REFRESH_MODE_CLEAR_AND_GENERATE;
+        return $this->refreshMode === self::REFRESH_MODE_EXPIRE_AND_GENERATE
+            || $this->refreshMode === self::REFRESH_MODE_CLEAR_AND_GENERATE;
     }
 
     /**

diff --git a/src/services/RefreshCacheService.php b/src/services/RefreshCacheService.php
@@ -416,10 +416,10 @@ public function refreshSiteUriIfExpired(SiteUriModel $siteUri): void
 
         $this->addCacheIds($cacheIds);
 
-        // Force clear the cache if it will not be regenerated.
-        $forceClear = !Blitz::$plugin->settings->generateOnRefresh();
+        // Forcibly generate the cache if it will not be cleared.
+        $forceGenerate = !Blitz::$plugin->settings->clearOnRefresh();
 
-        $this->refresh($forceClear);
+        $this->refresh(false, $forceGenerate);
     }
 
     /**
@@ -530,10 +530,10 @@ public function refreshExpiredCache(): void
             }
         }
 
-        // Force clear the cache if it will not be regenerated.
-        $forceClear = !Blitz::$plugin->settings->generateOnRefresh();
+        // Forcibly generate the cache if it will not be cleared.
+        $forceGenerate = !Blitz::$plugin->settings->clearOnRefresh();
 
-        $this->refresh($forceClear);
+        $this->refresh(false, $forceGenerate);
     }
 
     /**