From 818a8709ce1015a3d8cea8750d1596c184434b9b Mon Sep 17 00:00:00 2001
From: bopol <bopol@e.email>
Date: Mon, 14 Jun 2021 23:02:33 +0200
Subject: [PATCH] Use URLSearchParams

---
 src/components/Channel.vue           |  5 +++--
 src/components/Playlist.vue          |  6 ++++--
 src/components/SearchResults.vue     | 22 +++++++++++-----------
 src/components/SearchSuggestions.vue |  4 +++-
 src/components/WatchVideo.vue        | 15 +++++++++------
 5 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/components/Channel.vue b/src/components/Channel.vue
index 715054e1..0b8012c6 100644
--- a/src/components/Channel.vue
+++ b/src/components/Channel.vue
@@ -74,12 +74,13 @@ export default {
             if (this.loading || !this.channel || !this.channel.nextpage) return;
             if (window.innerHeight + window.scrollY >= document.body.offsetHeight - window.innerHeight) {
                 this.loading = true;
+                let params = new URLSearchParams();
+                params.append("nextpage", this.channel.nextpage);
                 this.fetchJson(
                     Constants.BASE_URL +
                         "/nextpage/channels/" +
                         this.channel.id +
-                        "?nextpage=" +
-                        encodeURIComponent(this.channel.nextpage),
+                        "?" + params.toString()
                 ).then(json => {
                     this.channel.relatedStreams.concat(json.relatedStreams);
                     this.channel.nextpage = json.nextpage;
diff --git a/src/components/Playlist.vue b/src/components/Playlist.vue
index 10fae9e7..f2e7818a 100644
--- a/src/components/Playlist.vue
+++ b/src/components/Playlist.vue
@@ -74,12 +74,14 @@ export default {
             if (this.loading || !this.playlist || !this.playlist.nextpage) return;
             if (window.innerHeight + window.scrollY >= document.body.offsetHeight - window.innerHeight) {
                 this.loading = true;
+                let params = new URLSearchParams();
+                params.append("nextpage", this.playlist.nextpage);
                 this.fetchJson(
                     Constants.BASE_URL +
                         "/nextpage/playlists/" +
                         this.$route.query.list +
-                        "?nextpage=" +
-                        encodeURIComponent(this.playlist.nextpage),
+                        "?" +
+                        params.toString()
                 ).then(json => {
                     this.playlist.relatedStreams.concat(json.relatedStreams);
                     this.playlist.nextpage = json.nextpage;
diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue
index f03a6dd9..482a4425 100644
--- a/src/components/SearchResults.vue
+++ b/src/components/SearchResults.vue
@@ -100,12 +100,13 @@ export default {
     },
     methods: {
         async fetchResults() {
+            let params = new URLSearchParams();
+            params.append("q", this.$route.query.search_query);
+            params.append("filter", this.selectedFilter)
             return await await this.fetchJson(
                 Constants.BASE_URL +
-                    "/search?q=" +
-                    encodeURIComponent(this.$route.query.search_query) +
-                    "&filter=" +
-                    this.selectedFilter,
+                    "/search?" +
+                    params.toString()
             );
         },
         async updateResults() {
@@ -116,15 +117,14 @@ export default {
             if (this.loading || !this.results || !this.results.nextpage) return;
             if (window.innerHeight + window.scrollY >= document.body.offsetHeight - window.innerHeight) {
                 this.loading = true;
+                let params = new URLSearchParams();
+                params.append("nextpage", this.results.nextpage);
+                params.append("q", this.$route.query.search_query);
+                params.append("filter", this.selectedFilter);
                 this.fetchJson(
                     Constants.BASE_URL +
-                        "/nextpage/search" +
-                        "?nextpage=" +
-                        encodeURIComponent(this.results.nextpage) +
-                        "&q=" +
-                        encodeURIComponent(this.$route.query.search_query) +
-                        "&filter=" +
-                        this.selectedFilter,
+                        "/nextpage/search?" +
+                        params.toString()
                 ).then(json => {
                     this.results.nextpage = json.nextpage;
                     this.results.id = json.id;
diff --git a/src/components/SearchSuggestions.vue b/src/components/SearchSuggestions.vue
index 7dffa594..38e510bd 100644
--- a/src/components/SearchSuggestions.vue
+++ b/src/components/SearchSuggestions.vue
@@ -49,8 +49,10 @@ export default {
             }
         },
         async refreshSuggestions() {
+            let params = new URLSearchParams();
+            params.append("query", this.searchText);
             this.searchSuggestions = await this.fetchJson(
-                Constants.BASE_URL + "/suggestions?query=" + encodeURI(this.searchText),
+                Constants.BASE_URL + "/suggestions?" + params.toString()
             );
             this.searchSuggestions.unshift(this.searchText);
             this.setSelected(0);
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index 59078490..d916af2f 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -144,14 +144,16 @@ export default {
             return this.fetchJson(Constants.BASE_URL + "/streams/" + this.getVideoId());
         },
         async fetchSponsors() {
+            let params = new URLSearchParams();
+            let category = (localStorage && localStorage.getItem("selectedSkip") !== null
+                ? '["' + localStorage.getItem("selectedSkip").replace(",", '","') + '"]'
+                : '["sponsor", "interaction", "selfpromo", "music_offtopic"]');
+            params.append("category", category);
             return await this.fetchJson(
                 Constants.BASE_URL +
                     "/sponsors/" +
                     this.getVideoId() +
-                    "?category=" +
-                    (localStorage && localStorage.getItem("selectedSkip") !== null
-                        ? encodeURIComponent('["' + localStorage.getItem("selectedSkip").replace(",", '","') + '"]')
-                        : encodeURIComponent('["sponsor", "interaction", "selfpromo", "music_offtopic"]')),
+                    "?" + params.toString()
             );
         },
         fetchComments() {
@@ -191,12 +193,13 @@ export default {
             if (this.loading || !this.comments || !this.comments.nextpage) return;
             if (window.innerHeight + window.scrollY >= this.$refs.comments.offsetHeight - window.innerHeight) {
                 this.loading = true;
+                let params = new URLSearchParams();
+                params.append("url", this.comments.nextpage);
                 this.fetchJson(
                     Constants.BASE_URL +
                         "/nextpage/comments/" +
                         this.getVideoId() +
-                        "?url=" +
-                        encodeURIComponent(this.comments.nextpage),
+                        "?" + params.toString()
                 ).then(json => {
                     this.comments.nextpage = json.nextpage;
                     this.loading = false;