Include sites in sitemap cache key (#439)

Author: duncanmcclean

src/Http/Controllers/SitemapController.php

@@ -9,25 +9,27 @@
 
 class SitemapController extends Controller
 {
+    public function __construct(public Sitemap $sitemap) {}
+
     public function index()
     {
         abort_unless(config('statamic.seo-pro.sitemap.enabled'), 404);
 
-        $key = request()->getHttpHost();
         $cacheUntil = Carbon::now()->addMinutes(config('statamic.seo-pro.sitemap.expire'));
+        $cacheKey = implode('_', [Sitemap::CACHE_KEY, request()->getHttpHost(), $this->sitemap->sites()->map->handle()->join('')]);
 
         if (config('statamic.seo-pro.sitemap.pagination.enabled', false)) {
-            $content = Cache::remember(Sitemap::CACHE_KEY.'_'.$key.'_index', $cacheUntil, function () {
+            $content = Cache::remember("{$cacheKey}_index", $cacheUntil, function () {
                 return view('seo-pro::sitemap_index', [
                     'xml_header' => '<?xml version="1.0" encoding="UTF-8"?>',
-                    'sitemaps' => app(Sitemap::class)->paginatedSitemaps(),
+                    'sitemaps' => $this->sitemap->paginatedSitemaps(),
                 ])->render();
             });
         } else {
-            $content = Cache::remember(Sitemap::CACHE_KEY.'_'.$key, $cacheUntil, function () {
+            $content = Cache::remember($cacheKey, $cacheUntil, function () {
                 return view('seo-pro::sitemap', [
                     'xml_header' => '<?xml version="1.0" encoding="UTF-8"?>',
-                    'pages' => app(Sitemap::class)->pages(),
+                    'pages' => $this->sitemap->pages(),
                 ])->render();
             });
         }
@@ -42,11 +44,10 @@ public function show($page)
         abort_unless(filter_var($page, FILTER_VALIDATE_INT), 404);
 
         $cacheUntil = Carbon::now()->addMinutes(config('statamic.seo-pro.sitemap.expire'));
-
-        $cacheKey = Sitemap::CACHE_KEY.'_'.$page;
+        $cacheKey = implode('_', [Sitemap::CACHE_KEY, $page, request()->getHttpHost(), $this->sitemap->sites()->map->handle()->join('')]);
 
         $content = Cache::remember($cacheKey, $cacheUntil, function () use ($page) {
-            abort_if(empty($pages = app(Sitemap::class)->paginatedPages($page)), 404);
+            abort_if(empty($pages = $this->sitemap->paginatedPages($page)), 404);
 
             return view('seo-pro::sitemap', [
                 'xml_header' => '<?xml version="1.0" encoding="UTF-8"?>',

src/Sitemap/Sitemap.php

@@ -97,7 +97,7 @@ public function paginatedSitemaps(): array
             ->all();
     }
 
-    private function sites(): IlluminateCollection
+    public function sites(): IlluminateCollection
     {
         $sites = SiteFacade::all()->filter(fn ($site) => Str::of($site->absoluteUrl())->startsWith(request()->schemeAndHttpHost()));