Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / core / routing / redirect.service.ts

diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index 43b89f08dc8e194f1ca7e4759d5c6d13fb46b1bf..cf690a4d06ecc86851d7edaa6749901f28981788 100644 (file)
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -1,46 +1,61 @@
 import { Injectable } from '@angular/core'
-import { NavigationEnd, Router } from '@angular/router'
+import { NavigationCancel, NavigationEnd, Router } from '@angular/router'
 import { ServerService } from '../server'
 
 @Injectable()
 export class RedirectService {
   // Default route could change according to the instance configuration
   static INIT_DEFAULT_ROUTE = '/videos/trending'
-  static DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
+  static INIT_DEFAULT_TRENDING_ALGORITHM = 'most-viewed'
 
   private previousUrl: string
   private currentUrl: string
 
+  private redirectingToHomepage = false
+  private defaultTrendingAlgorithm = RedirectService.INIT_DEFAULT_TRENDING_ALGORITHM
+  private defaultRoute = RedirectService.INIT_DEFAULT_ROUTE
+
   constructor (
     private router: Router,
     private serverService: ServerService
   ) {
     // The config is first loaded from the cache so try to get the default route
-    const config = this.serverService.getConfig()
-    if (config && config.instance && config.instance.defaultClientRoute) {
-      RedirectService.DEFAULT_ROUTE = config.instance.defaultClientRoute
+    const tmpConfig = this.serverService.getTmpConfig()
+    if (tmpConfig?.instance?.defaultClientRoute) {
+      this.defaultRoute = tmpConfig.instance.defaultClientRoute
+    }
+    if (tmpConfig?.trending?.videos?.algorithms?.default) {
+      this.defaultTrendingAlgorithm = tmpConfig.trending.videos.algorithms.default
     }
 
     // Load default route
-    this.serverService.configLoaded
-        .subscribe(() => {
-          const defaultRouteConfig = this.serverService.getConfig().instance.defaultClientRoute
+    this.serverService.getConfig()
+        .subscribe(config => {
+          const defaultRouteConfig = config.instance.defaultClientRoute
+          const defaultTrendingConfig = config.trending.videos.algorithms.default
 
-          if (defaultRouteConfig) {
-            RedirectService.DEFAULT_ROUTE = defaultRouteConfig
-          }
+          if (defaultRouteConfig) this.defaultRoute = defaultRouteConfig
+          if (defaultTrendingConfig) this.defaultTrendingAlgorithm = defaultTrendingConfig
         })
 
     // Track previous url
     this.currentUrl = this.router.url
     router.events.subscribe(event => {
-      if (event instanceof NavigationEnd) {
+      if (event instanceof NavigationEnd || event instanceof NavigationCancel) {
         this.previousUrl = this.currentUrl
         this.currentUrl = event.url
       }
     })
   }
 
+  getDefaultRoute () {
+    return this.defaultRoute
+  }
+
+  getDefaultTrendingAlgorithm () {
+    return this.defaultTrendingAlgorithm
+  }
+
   redirectToPreviousRoute () {
     const exceptions = [
       '/verify-account',
@@ -56,18 +71,25 @@ export class RedirectService {
   }
 
   redirectToHomepage (skipLocationChange = false) {
-    console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
+    if (this.redirectingToHomepage) return
+
+    this.redirectingToHomepage = true
 
-    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+    console.log('Redirecting to %s...', this.defaultRoute)
+
+    this.router.navigateByUrl(this.defaultRoute, { skipLocationChange })
+        .then(() => this.redirectingToHomepage = false)
         .catch(() => {
+          this.redirectingToHomepage = false
+
           console.error(
             'Cannot navigate to %s, resetting default route to %s.',
-            RedirectService.DEFAULT_ROUTE,
+            this.defaultRoute,
             RedirectService.INIT_DEFAULT_ROUTE
           )
 
-          RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
-          return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+          this.defaultRoute = RedirectService.INIT_DEFAULT_ROUTE
+          return this.router.navigateByUrl(this.defaultRoute, { skipLocationChange })
         })
 
   }