chore: 🔀 merge pull request #7 from elaniin/hotfix/sitemap-json-asser…

…tion Fix fatal error in sitemaps
elaniin · Jan 27, 2022 · d24b138 · d24b138
2 parents 8a55960 + 9dbba9e
commit d24b138
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/Data/Entry.php b/src/Data/Entry.php
@@ -19,7 +19,6 @@ public static function public(string $collectionHandle, Site $site)
         return EntryFacade::query()
             ->where('collection', $collectionHandle)
             ->where('site', $site)
-            ->whereJsonDoesntContain('data', ['noindex_page' => true])
             ->get();
     }
 }
diff --git a/src/Sitemap/Sitemap.php b/src/Sitemap/Sitemap.php
@@ -3,9 +3,11 @@
 namespace Elaniin\Findable\Sitemap;
 
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 use Spatie\Sitemap\Sitemap as SpatieSitemap;
 use Spatie\Sitemap\Tags\Url;
-use Illuminate\Support\Collection;
+use Statamic\Contracts\Entries\Entry;
+use Statamic\Entries\EntryCollection;
 use Statamic\Facades\Site;
 
 class Sitemap
@@ -41,18 +43,22 @@ public static function index(Collection $dataTypes)
      * @param EntryCollection $entries
      * @return SpatieSitemap
      */
-    public static function collection(\Statamic\Entries\EntryCollection $entries)
+    public static function collection(EntryCollection $entries)
     {
         $sitemap = SpatieSitemap::create();
 
-        $entries->each(function ($entry) use ($sitemap) {
-            $sitemap->add(
-                Url::create($entry->url())
-                    ->setChangeFrequency('')
-                    ->setPriority(0)
-                    ->setLastModificationDate(Carbon::createFromTimestamp($entry->lastModified()))
-            );
-        });
+        $entries
+            ->filter(function (Entry $entry) {
+                return $entry->get('noindex_page') !== true;
+            })
+            ->each(function (Entry $entry) use ($sitemap) {
+                $sitemap->add(
+                    Url::create($entry->url())
+                        ->setChangeFrequency('')
+                        ->setPriority(0)
+                        ->setLastModificationDate(Carbon::createFromTimestamp($entry->lastModified()))
+                );
+            });
 
         return $sitemap;
     }