Fix: #4873 - Add Link/rel=canonical to genealogy pages and redirects

1 files changed, 10 insertions, 20 deletions

diff --git a/app/Http/RequestHandlers/RedirectNotePhp.php b/app/Http/RequestHandlers/RedirectNotePhp.php
index 255e017c5e..701fb871f5 100644
--- a/app/Http/RequestHandlers/RedirectNotePhp.php
+++ b/app/Http/RequestHandlers/RedirectNotePhp.php
@@ -20,8 +20,7 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Http\RequestHandlers;
 
 use Fig\Http\Message\StatusCodeInterface;
-use Fisharebest\Webtrees\Http\Exceptions\HttpNotFoundException;
-use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Http\Exceptions\HttpGoneException;
 use Fisharebest\Webtrees\Note;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\TreeService;
@@ -37,22 +36,11 @@ use Psr\Http\Server\RequestHandlerInterface;
  */
 class RedirectNotePhp implements RequestHandlerInterface
 {
-    private TreeService $tree_service;
-
-    /**
-     * @param TreeService $tree_service
-     */
-    public function __construct(TreeService $tree_service)
-    {
-        $this->tree_service = $tree_service;
+    public function __construct(
+        private readonly TreeService $tree_service,
+    ) {
     }
 
-    /**
-     * @param ServerRequestInterface $request
-     *
-     * @return ResponseInterface
-     * @throws HttpNotFoundException
-     */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $ged  = Validator::queryParams($request)->string('ged', Site::getPreference('DEFAULT_GEDCOM'));
@@ -63,12 +51,14 @@ class RedirectNotePhp implements RequestHandlerInterface
             $note = Registry::noteFactory()->make($nid, $tree);
 
             if ($note instanceof Note) {
-                return Registry::responseFactory()->redirectUrl($note->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY);
+                $url = $note->url();
+
+                return Registry::responseFactory()
+                    ->redirectUrl($url, StatusCodeInterface::STATUS_MOVED_PERMANENTLY)
+                    ->withHeader('Link', '<' . $url . '>; rel="canonical"');
             }
         }
 
-        $message = I18N::translate('This note does not exist or you do not have permission to view it.');
-
-        throw new HttpNotFoundException($message);
+        throw new HttpGoneException();
     }
 }