From 110bfc9ff15939995e68e5f0cc976a59c7e9cab1 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Thu, 22 Oct 2020 00:28:36 +0200
Subject: [PATCH] Cleaner way to build the canonical URL

---
 classes/Controller/FrontController.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/classes/Controller/FrontController.php b/classes/Controller/FrontController.php
index 912fc8d..1c1a171 100644
--- a/classes/Controller/FrontController.php
+++ b/classes/Controller/FrontController.php
@@ -13,6 +13,7 @@ use Alltube\Locale;
 use Alltube\Middleware\CspMiddleware;
 use Exception;
 use Slim\Http\StatusCode;
+use Slim\Http\Uri;
 use Symfony\Component\ErrorHandler\ErrorRenderer\HtmlErrorRenderer;
 use Throwable;
 use Psr\Container\ContainerInterface;
@@ -332,19 +333,11 @@ class FrontController extends BaseController
      */
     private function getCanonicalUrl(Request $request)
     {
+        /** @var Uri $uri */
         $uri = $request->getUri();
-        $return = 'https://alltubedownload.net/';
 
-        $path = $uri->getPath();
-        if ($path != '/') {
-            $return .= $path;
-        }
-
-        $query = $uri->getQuery();
-        if (!empty($query)) {
-            $return .= '?' . $query;
-        }
-
-        return $return;
+        return $uri->withBasePath('')
+            ->withHost('alltubedownload.net')
+            ->withScheme('https');
     }
 }