From 25d7cc3cb675de36fe67402e307e1ba02f3316bc Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 5 Jun 2023 10:33:35 +0200
Subject: Fix custom default route link

---
 client/src/app/app.component.html |  2 +-
 client/src/app/app.component.ts   | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'client')

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 5fefffaf4..8ef22392d 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -10,7 +10,7 @@
         <span class="icon icon-menu"></span>
       </span>
 
-      <a class="peertube-title c-hand" [routerLink]="getDefaultRoute()">
+      <a class="peertube-title c-hand" [routerLink]="getDefaultRoute()" [queryParams]="getDefaultRouteQuery()">
         <span class="icon icon-logo"></span>
         <span class="instance-name">{{ instanceName }}</span>
       </a>
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index da3ffef2f..f6d90cb64 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -131,10 +131,18 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.pluginService.initializeCustomModal(this.customModal)
   }
 
+  // ---------------------------------------------------------------------------
+
   getDefaultRoute () {
-    return this.redirectService.getDefaultRoute()
+    return this.redirectService.getDefaultRoute().split('?')[0]
+  }
+
+  getDefaultRouteQuery () {
+    return this.router.parseUrl(this.redirectService.getDefaultRoute()).queryParams
   }
 
+  // ---------------------------------------------------------------------------
+
   getToggleTitle () {
     if (this.menu.isDisplayed()) return $localize`Close the left menu`
 
-- 
cgit v1.2.3