Give moderators access to edit channels (#4608)

[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 76e28e4611b7d35790a5870c1715ffc46b5c1e25..571476d1de529583b793c08ca5a2f8b3cd1fb65d 100644 (file)
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -6,45 +6,27 @@ import { ServerService } from '../server'
 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_ROUTE = '/videos/most-viewed'
-  static DEFAULT_TRENDING_ROUTE = RedirectService.INIT_DEFAULT_TRENDING_ROUTE
+  static INIT_DEFAULT_TRENDING_ALGORITHM = 'most-viewed'
 
   private previousUrl: string
   private currentUrl: string
 
   private redirectingToHomepage = false
-  private redirectingToTrending = 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 tmpConfig = this.serverService.getTmpConfig()
-    if (tmpConfig && tmpConfig.instance) {
-      if (tmpConfig.instance.defaultClientRoute) {
-        RedirectService.DEFAULT_ROUTE = tmpConfig.instance.defaultClientRoute
-      }
-      if (tmpConfig.instance.defaultTrendingRoute) {
-        RedirectService.DEFAULT_TRENDING_ROUTE = tmpConfig.instance.defaultTrendingRoute
-      }
+    const config = this.serverService.getHTMLConfig()
+    if (config?.instance?.defaultClientRoute) {
+      this.defaultRoute = config.instance.defaultClientRoute
+    }
+    if (config?.trending?.videos?.algorithms?.default) {
+      this.defaultTrendingAlgorithm = config.trending.videos.algorithms.default
     }
-
-    // Load default route
-    this.serverService.getConfig()
-        .subscribe(config => {
-          const defaultRouteConfig = config.instance.defaultClientRoute
-          const defaultTrendingConfig = config.instance.defaultTrendingRoute
-
-          if (defaultRouteConfig) {
-            RedirectService.DEFAULT_ROUTE = defaultRouteConfig
-          }
-
-          if (defaultTrendingConfig) {
-            RedirectService.DEFAULT_TRENDING_ROUTE = defaultTrendingConfig
-          }
-        })
 
     // Track previous url
     this.currentUrl = this.router.url
@@ -56,7 +38,15 @@ export class RedirectService {
     })
   }
 
-  redirectToPreviousRoute () {
+  getDefaultRoute () {
+    return this.defaultRoute
+  }
+
+  getDefaultTrendingAlgorithm () {
+    return this.defaultTrendingAlgorithm
+  }
+
+  redirectToPreviousRoute (fallbackRoute: string[] = null) {
     const exceptions = [
       '/verify-account',
       '/reset-password'
@@ -67,16 +57,11 @@ export class RedirectService {
       if (!isException) return this.router.navigateByUrl(this.previousUrl)
     }
 
-    return this.redirectToHomepage()
-  }
-
-  redirectToTrending () {
-    if (this.redirectingToTrending) return
-
-    this.redirectingToTrending = true
+    if (fallbackRoute) {
+      return this.router.navigate(fallbackRoute)
+    }
 
-    this.router.navigate([ RedirectService.DEFAULT_TRENDING_ROUTE ])
-        .then(() => this.redirectingToTrending = false)
+    return this.redirectToHomepage()
   }
 
   redirectToHomepage (skipLocationChange = false) {
@@ -84,21 +69,21 @@ export class RedirectService {
 
     this.redirectingToHomepage = true
 
-    console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
+    console.log('Redirecting to %s...', this.defaultRoute)
 
-    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { skipLocationChange })
+    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 })
         })
 
   }