Remove hreflang of canonicalized pages

aerni · Jul 10, 2024 · a4ebfad · a4ebfad
1 parent 3cd7610
commit a4ebfad
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/src/View/Concerns/HasHreflang.php b/src/View/Concerns/HasHreflang.php
@@ -16,7 +16,7 @@ trait HasHreflang
 
     protected function entryAndTermHreflang(Entry|LocalizedTerm $model): ?array
     {
-        if (! $this->isIndexable($model)) {
+        if (! $this->shouldIncludeHreflang($model)) {
             return null;
         }
 
@@ -31,7 +31,7 @@ protected function entryAndTermHreflang(Entry|LocalizedTerm $model): ?array
         $hreflang = $sites
             ->map(fn ($locale) => $model->in($locale))
             ->filter() // A model might not exist in a site. So we need to remove it to prevent calling methods on null
-            ->filter($this->isIndexable(...));
+            ->filter($this->shouldIncludeHreflang(...));
 
         if ($hreflang->count() < 2) {
             return null;
@@ -44,7 +44,7 @@ protected function entryAndTermHreflang(Entry|LocalizedTerm $model): ?array
 
         $origin = $model->origin() ?? $model;
 
-        $xDefault = $this->isIndexable($origin) ? $origin : $model;
+        $xDefault = $this->shouldIncludeHreflang($origin) ? $origin : $model;
 
         return $hreflang->push([
             'url' => $this->absoluteUrl($xDefault),
@@ -136,4 +136,18 @@ protected function collectionTaxonomyUrl(Taxonomy $taxonomy, string $site): stri
 
         return URL::tidy("{$siteUrl}/{$collectionHandle}/{$taxonomyHandle}");
     }
+
+    protected function shouldIncludeHreflang(Entry|LocalizedTerm $model): bool
+    {
+        if ($this->canonicalPointsToAnotherUrl($model)) {
+            return false;
+        }
+
+        return $this->isIndexable($model);
+    }
+
+    protected function canonicalPointsToAnotherUrl(Entry|LocalizedTerm $model): bool
+    {
+        return $model->seo_canonical_type != 'current';
+    }
 }