From 9eb3b1fc2075dce72527a8051422dfb9e152ff3f Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Thu, 17 Dec 2020 11:22:05 -0500
Subject: [PATCH] Fix playback rates and search pagination

---
 package-lock.json                             | 21 ++++++++---------
 package.json                                  |  6 ++---
 .../ft-video-player/ft-video-player.js        | 23 ++++++++++---------
 src/renderer/store/modules/ytdl.js            |  6 ++---
 4 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5d44e476..dfbeb02c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18731,11 +18731,10 @@
       "integrity": "sha512-MH9xq4gxR54oktdPnkMXftKJ7aqp3iCDURKjEg/5NBoCPsOZUGFMtyAaVUBVNQsoAg1Dd0vxEPinbC/aJa/InQ=="
     },
     "ytdl-core": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-4.1.4.tgz",
-      "integrity": "sha512-f9M2ctrQNH9/X+jOZ/4iA4h6DvNcyuJ+fDvacheeaxtV7sX13qaNmQgNAe7UeTlJWh7Dn3RHQ6imqJJh5beGQg==",
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-4.1.6.tgz",
+      "integrity": "sha512-byQCynwQeqzn0VkzASFWs41sxnGSHgAXC4Dm6r7woK3e/WNtTr0sfOIgLkRKXaTw3ez5Pq5VhGwFQtbY6YbxRA==",
       "requires": {
-        "html-entities": "^1.3.1",
         "m3u8stream": "^0.8.3",
         "miniget": "^4.0.0",
         "sax": "^1.1.3"
@@ -18763,11 +18762,10 @@
       }
     },
     "ytpl": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ytpl/-/ytpl-2.0.1.tgz",
-      "integrity": "sha512-FK6Qz43PKDqKcxI8K9tEOMJ7S/MVN6Ofc9flolPloMN4hJm+N6wZd3Y9oD+amQYHMCVkaXT0BvPMY4BUYg3FpQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/ytpl/-/ytpl-2.0.3.tgz",
+      "integrity": "sha512-E5nH0gULzpXAh7rcj6X7I8MK0L8hiprzZzsxTc/OPZDcYF53Z7O5IbU1vgMYzEmVsPtTLEWejT2HUWdjlgaCSQ==",
       "requires": {
-        "html-entities": "^1.3.1",
         "miniget": "^4.1.0"
       },
       "dependencies": {
@@ -18779,11 +18777,10 @@
       }
     },
     "ytsr": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ytsr/-/ytsr-2.0.1.tgz",
-      "integrity": "sha512-1m/jmX8X1PJSnX1eJ3sm3s8Z2S/ixYKTZduuLsGn/RsxEI9nqV2iWCRi0qTQ8rOSaoEwkeWcJHLlZPbd499p/w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ytsr/-/ytsr-3.0.0.tgz",
+      "integrity": "sha512-/HgM0Vi8a3bJOpw8QZVWhfka0OygluQtfK7B8Kv5gkGdZEDLLJKFUb5i0ytUMWUNzUSNtO4vIAeLBVYYX4B4Dg==",
       "requires": {
-        "html-entities": "^1.3.1",
         "miniget": "^4.1.0"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index 8aaed86f..30b2e5a0 100644
--- a/package.json
+++ b/package.json
@@ -47,9 +47,9 @@
     "yt-dash-manifest-generator": "^1.1.0",
     "yt-trending-scraper": "^1.0.4",
     "yt-xml2vtt": "^1.1.3",
-    "ytdl-core": "4.1.4",
-    "ytpl": "^2.0.1",
-    "ytsr": "^2.0.1"
+    "ytdl-core": "^4.1.6",
+    "ytpl": "^2.0.3",
+    "ytsr": "^3.0.0"
   },
   "description": "A private YouTube client",
   "devDependencies": {
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index 5e446ae9..d84cb824 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -94,18 +94,19 @@ export default Vue.extend({
           ]
         },
         playbackRates: [
-          3,
-          2.75,
-          2.5,
-          2.25,
-          2,
-          1.75,
-          1.5,
-          1.25,
-          1,
-          0.75,
+          0.25,
           0.5,
-          0.25
+          0.75,
+          1,
+          1.25,
+          1.5,
+          1.75,
+          2,
+          2.25,
+          2.5,
+          2.75,
+          2.75,
+          3
         ]
       }
     }
diff --git a/src/renderer/store/modules/ytdl.js b/src/renderer/store/modules/ytdl.js
index ead49fac..2ba6998c 100644
--- a/src/renderer/store/modules/ytdl.js
+++ b/src/renderer/store/modules/ytdl.js
@@ -24,11 +24,11 @@ const actions = {
         resolve(false)
       }
 
-      if (typeof payload.options.nextPageRef !== 'undefined') {
-        const continuation = payload.options.nextPageRef
+      if (typeof payload.options.nextpageRef !== 'undefined') {
+        const continuation = payload.options.nextpageRef
         const nextPageResults = ytsr.continueReq(continuation)
-        console.log(nextPageResults)
         resolve(nextPageResults)
+        return
       }
 
       const defaultFilters = {