fix robots blueprint not generating for defaults on pages (#89), redi…

…rect /sitemap (#84), fix disabling robots (#87)
tobimori · Mar 21, 2024 · 6fd227e · 6fd227e
1 parent 9e40fce
commit 6fd227e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 12 deletions.
diff --git a/blueprints/fields/robots.php b/blueprints/fields/robots.php
@@ -6,10 +6,7 @@
 use tobimori\Seo\Meta;
 
 return function (App $kirby) {
-	if (
-		!$kirby->option('tobimori.seo.robots.pageSettings', $kirby->option('tobimori.seo.robots.active', false))
-		|| !($page = Meta::currentPage())
-	) {
+	if (!$kirby->option('tobimori.seo.robots.active') || !$kirby->option('tobimori.seo.robots.pageSettings')) {
 		return [
 			'type' => 'hidden'
 		];
@@ -23,19 +20,24 @@
 		]
 	];
 
+	$page = Meta::currentPage();
 	foreach ($kirby->option('tobimori.seo.robots.types') as $robots) {
 		$upper = Str::ucfirst($robots);
-		$default = $page->metadata()->get("robots{$upper}", ['fields'])->toBool() ? t('yes') : t('no');
 
 		$fields["robots{$upper}"] = [
-			'label' =>  'robots-' . $robots,
+			'label' =>  "robots-{$robots}",
 			'type' => 'toggles',
-			'help' => 'robots-' . $robots . '-help',
+			'help' => "robots-{$robots}-help",
 			'width' => '1/2',
 			'default' => 'default',
 			'required' => true,
 			'options' => [
-				'default' => A::join([t('default-select'), $default], ' '),
+				'default' => $page ?
+					A::join([
+						t('default-select'),
+						$page->metadata()->get("robots{$upper}", ['fields'])->toBool() ? t('yes') : t('no')
+					], ' ')
+					: t('default-select'),
 				'true' => t('yes'),
 				'false' => t('no'),
 			]

diff --git a/blueprints/fields/site-robots.php b/blueprints/fields/site-robots.php
@@ -1,10 +1,9 @@
 <?php
 
 use Kirby\Cms\App;
-use Kirby\Toolkit\Str;
 
 return function (App $kirby) {
-	if (!$kirby->option('tobimori.seo.robots.pageSettings', $kirby->option('tobimori.seo.robots.active', false))) {
+	if (!$kirby->option('tobimori.seo.robots.active') || !$kirby->option('tobimori.seo.robots.pageSettings')) {
 		return [
 			'type' => 'hidden'
 		];
@@ -25,9 +24,9 @@
 		}
 
 		$fields["robots{$robots}"] = [
-			'label' =>  'robots-' . Str::lower($robots),
+			'label' =>  "robots-{$robots}",
 			'type' => 'toggles',
-			'help' => 'robots-' . Str::lower($robots) . '-help',
+			'help' => "robots-{$robots}-help",
 			'width' => '1/2',
 			'default' => 'default',
 			'required' => true,

diff --git a/config/hooks.php b/config/hooks.php
@@ -1,8 +1,19 @@
 <?php
 
 use Kirby\Cms\Page;
+use Kirby\Toolkit\Str;
 
 return [
+	'page.update:after' => function (Page $newPage, Page $oldPage) {
+		foreach ($newPage->kirby()->option('tobimori.seo.robots.types') as $robots) {
+			$upper = Str::ucfirst($robots);
+			if ($newPage->content()->get("robots{$upper}")->value() === "") {
+				$newPage = $newPage->update([
+					"robots{$upper}" => 'default'
+				]);
+			}
+		}
+	},
 	'page.render:before' => function (string $contentType, array $data, Page $page) {
 		if (option('tobimori.seo.generateSchema')) {
 			$page->schema('WebSite')

diff --git a/config/options.php b/config/options.php
@@ -63,6 +63,7 @@
 	],
 	'sitemap' => [
 		'active' => true,
+		'redirect' => true, // redirect /sitemap to /sitemap.xml
 		'lang' => 'en',
 		'generator' => require __DIR__ . '/options/sitemap.php',
 		'changefreq' => 'weekly',

diff --git a/config/routes.php b/config/routes.php
@@ -16,6 +16,16 @@
 			$this->next();
 		}
 	],
+	[
+		'pattern' => 'sitemap',
+		'action' => function () {
+			if (!option('tobimori.seo.sitemap.redirect', true) || !option('tobimori.seo.sitemap.active', true)) {
+				$this->next();
+			}
+
+			go('/sitemap.xml');
+		}
+	],
 	[
 		'pattern' => 'sitemap.xsl',
 		'action' => function () {