From 564341913176c0208e00c8f1afe6116865411aa9 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 21 Jun 2022 04:29:39 +0200
Subject: [PATCH] Fix the redundant navigation error (#2286)

* Fix the redundant navigation error

* Fix the redundant navigation error for the profile selector settings button

* Wrap router push in function that prevents redundant navigation

* Improve duplicate route detection

Co-authored-by: PikachuEXE <pikachuexe@gmail.com>

* Remove unused function

Co-authored-by: PikachuEXE <pikachuexe@gmail.com>
---
 src/renderer/router/index.js | 38 +++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index 8c9029c92..1d53907e1 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -14,9 +14,41 @@ import Playlist from '../views/Playlist/Playlist.vue'
 import Channel from '../views/Channel/Channel.vue'
 import Watch from '../views/Watch/Watch.vue'
 
-Vue.use(Router)
+class CustomRouter extends Router {
+  push(location) {
+    // only navigates if the location is not identical to the current location
 
-const router = new Router({
+    const currentQueryUSP = new URLSearchParams(router.currentRoute.query)
+    let newPath = ''
+    let newQueryUSP = new URLSearchParams()
+
+    if (typeof location === 'string') {
+      if (location.includes('?')) {
+        const urlParts = location.split('?')
+        newPath = urlParts[0]
+        newQueryUSP = new URLSearchParams(urlParts[1])
+      } else {
+        newPath = location
+        // newQueryUSP already empty
+      }
+    } else {
+      newPath = location.path
+      newQueryUSP = new URLSearchParams(location.query)
+    }
+
+    const pathsAreDiff = router.currentRoute.path !== newPath
+    // Comparing `URLSearchParams` objects directly will always be different
+    const queriesAreDiff = newQueryUSP.toString() !== currentQueryUSP.toString()
+
+    if (pathsAreDiff || queriesAreDiff) {
+      return super.push(location)
+    }
+  }
+}
+
+Vue.use(CustomRouter)
+
+const router = new CustomRouter({
   routes: [
     {
       path: '/',
@@ -142,7 +174,7 @@ const router = new Router({
       component: Watch
     }
   ],
-  scrollBehavior (to, from, savedPosition) {
+  scrollBehavior(to, from, savedPosition) {
     return new Promise((resolve, reject) => {
       setTimeout(() => {
         if (savedPosition !== null) {