improve SEO fields

Author: sten

src/Http/Controllers/PageController.php

@@ -11,7 +11,6 @@
 use Illuminate\Support\Facades\Cache;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 use Spatie\Image\Image;
-use Spatie\MediaLibrary\Conversions\ConversionCollection;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 use Statikbe\FilamentFlexibleContentBlockPages\Facades\FilamentFlexibleContentBlockPages;
 use Statikbe\FilamentFlexibleContentBlockPages\Models\Page;
@@ -79,7 +78,7 @@ public function grandchildIndex(Page $grandparent, Page $parent, Page $page)
 
     protected function getSEOTitlePostfix(Page $page): string
     {
-        if($page->isHomePage()) {
+        if ($page->isHomePage()) {
             return '';
         }
 
@@ -126,8 +125,8 @@ protected function getLocalisedUrls(): array
 
     protected function setBasicSEO(Page $page)
     {
-        $title = $page->seo_title ?? $page->title ?? $this->getSettingsTitle();
-        SEOTools::setTitle($title . $this->getSEOTitlePostfix($page), false);
+        $title = $this->getValidTitle($page->seo_title) ?? $this->getValidTitle($page->title) ?? $this->getSettingsTitle();
+        SEOTools::setTitle($title.$this->getSEOTitlePostfix($page), false);
         SEOTools::setDescription(($page->seo_description ?? strip_tags($page->intro)));
         SEOTools::opengraph()->setUrl(url()->current());
     }
@@ -192,4 +191,17 @@ private function getSettingsTitle(): string
     {
         return flexiblePagesSetting(Settings::SETTING_SITE_TITLE, app()->getLocale(), config('app.name'));
     }
+
+    private function getValidTitle(?string $title): ?string
+    {
+        if (! $title) {
+            return null;
+        }
+
+        if (empty(trim($title))) {
+            return null;
+        }
+
+        return $title ? trim($title) : null;
+    }
 }