X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Frouting%2Fredirect.service.ts;h=d4cb0436e54324b2b609805c5094ed857833966b;hb=cb28bb92daf1a0e123bc0144030c2bc65b865f4a;hp=abe044d7306e007dbab9ef61084b345fdff0a53e;hpb=108a66f0dac7586f2f7871c6bb77f73cb924f2b3;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/routing/redirect.service.ts b/client/src/app/core/routing/redirect.service.ts
index abe044d73..d4cb0436e 100644
--- a/client/src/app/core/routing/redirect.service.ts
+++ b/client/src/app/core/routing/redirect.service.ts
@@ -1,48 +1,94 @@
 import { Injectable } from '@angular/core'
-import { 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 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
     }
 
-    this.serverService.configLoaded
-      .subscribe(() => {
-        const defaultRouteConfig = this.serverService.getConfig().instance.defaultClientRoute
+    // Track previous url
+    this.currentUrl = this.router.url
+    router.events.subscribe(event => {
+      if (event instanceof NavigationEnd || event instanceof NavigationCancel) {
+        this.previousUrl = this.currentUrl
+        this.currentUrl = event.url
+      }
+    })
+  }
 
-        if (defaultRouteConfig) {
-          RedirectService.DEFAULT_ROUTE = defaultRouteConfig
-        }
-      })
+  getDefaultRoute () {
+    return this.defaultRoute
   }
 
-  redirectToHomepage () {
-    console.log('Redirecting to %s...', RedirectService.DEFAULT_ROUTE)
+  getDefaultTrendingAlgorithm () {
+    return this.defaultTrendingAlgorithm
+  }
 
-    this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { replaceUrl: true })
-      .catch(() => {
-        console.error(
-          'Cannot navigate to %s, resetting default route to %s.',
-          RedirectService.DEFAULT_ROUTE,
-          RedirectService.INIT_DEFAULT_ROUTE
-        )
+  getPreviousUrl () {
+    return this.previousUrl
+  }
+
+  redirectToPreviousRoute (fallbackRoute?: string) {
+    const exceptions = [
+      '/verify-account',
+      '/reset-password'
+    ]
 
-        RedirectService.DEFAULT_ROUTE = RedirectService.INIT_DEFAULT_ROUTE
-        return this.router.navigate([ RedirectService.DEFAULT_ROUTE ], { replaceUrl: true })
-      })
+    if (this.previousUrl && this.previousUrl !== '/') {
+      const isException = exceptions.find(e => this.previousUrl.startsWith(e))
+      if (!isException) return this.router.navigateByUrl(this.previousUrl)
+    }
 
+    if (fallbackRoute) {
+      return this.router.navigateByUrl(fallbackRoute)
+    }
+
+    return this.redirectToHomepage()
   }
 
+  redirectToHomepage (skipLocationChange = false) {
+    if (this.redirectingToHomepage) return
+
+    this.redirectingToHomepage = true
+
+    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.',
+            this.defaultRoute,
+            RedirectService.INIT_DEFAULT_ROUTE
+          )
+
+          this.defaultRoute = RedirectService.INIT_DEFAULT_ROUTE
+          return this.router.navigateByUrl(this.defaultRoute, { skipLocationChange })
+        })
+
+  }
 }