From 0bbe6dbf242a25b269f17fb656d3bdc046876cf1 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Thu, 11 Jan 2024 21:41:37 +0100
Subject: [PATCH] refacto: encode url with components becuase of / in base 64

---
 src/components/Discover/AddRss.vue  | 3 ++-
 src/components/Discover/Search.vue  | 3 ++-
 src/components/Discover/TopItem.vue | 4 +++-
 src/components/Feed/Banner.vue      | 3 ++-
 src/components/Feed/Episodes.vue    | 3 ++-
 src/components/Player/Infos.vue     | 4 +++-
 src/components/Sidebar/Item.vue     | 3 ++-
 src/utils/url.js                    | 2 ++
 8 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 src/utils/url.js

diff --git a/src/components/Discover/AddRss.vue b/src/components/Discover/AddRss.vue
index 1623401..ec9cecb 100644
--- a/src/components/Discover/AddRss.vue
+++ b/src/components/Discover/AddRss.vue
@@ -12,6 +12,7 @@
 <script>
 import { NcAppNavigationNewItem } from '@nextcloud/vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
+import { encodeUrl } from '../../utils/url.js'
 
 export default {
 	name: 'AddRss',
@@ -21,7 +22,7 @@ export default {
 	},
 	methods: {
 		addSubscription(feedUrl) {
-			this.$router.push(btoa(feedUrl))
+			this.$router.push(encodeUrl(feedUrl))
 		},
 	},
 }
diff --git a/src/components/Discover/Search.vue b/src/components/Discover/Search.vue
index 997423d..ca6a919 100644
--- a/src/components/Discover/Search.vue
+++ b/src/components/Discover/Search.vue
@@ -26,6 +26,7 @@ import AdaptativeList from '../Atoms/AdaptativeList.vue'
 import Loading from '../Atoms/Loading.vue'
 import axios from '@nextcloud/axios'
 import { debounce } from '../../utils/debounce.js'
+import { encodeUrl } from '../../utils/url.js'
 import { generateUrl } from '@nextcloud/router'
 import moment from '@nextcloud/moment'
 import { showError } from '@nextcloud/dialogs'
@@ -75,7 +76,7 @@ export default {
 			}
 		}, 200),
 		toUrl(url) {
-			return `/${btoa(url)}`
+			return `/${encodeUrl(url)}`
 		},
 	},
 }
diff --git a/src/components/Discover/TopItem.vue b/src/components/Discover/TopItem.vue
index 9b359d2..2855c25 100644
--- a/src/components/Discover/TopItem.vue
+++ b/src/components/Discover/TopItem.vue
@@ -5,6 +5,8 @@
 </template>
 
 <script>
+import { encodeUrl } from '../../utils/url.js'
+
 export default {
 	name: 'TopItem',
 	props: {
@@ -27,7 +29,7 @@ export default {
 	},
 	computed: {
 		toUrl() {
-			return `/${btoa(this.link)}`
+			return `/${encodeUrl(this.link)}`
 		},
 	},
 }
diff --git a/src/components/Feed/Banner.vue b/src/components/Feed/Banner.vue
index 03be0b1..324ed82 100644
--- a/src/components/Feed/Banner.vue
+++ b/src/components/Feed/Banner.vue
@@ -34,6 +34,7 @@
 import { NcAppNavigationNew, NcAvatar } from '@nextcloud/vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import axios from '@nextcloud/axios'
+import { decodeUrl } from '../../utils/url.js'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
@@ -68,7 +69,7 @@ export default {
 	},
 	computed: {
 		url() {
-			return atob(this.$route.params.url)
+			return decodeUrl(this.$route.params.url)
 		},
 		isSubscribed() {
 			return this.$store.state.subscriptions.subscriptions.includes(this.url)
diff --git a/src/components/Feed/Episodes.vue b/src/components/Feed/Episodes.vue
index 3ed3af7..227d99f 100644
--- a/src/components/Feed/Episodes.vue
+++ b/src/components/Feed/Episodes.vue
@@ -55,6 +55,7 @@ import Modal from './Modal.vue'
 import PlayButton from 'vue-material-design-icons/Play.vue'
 import StopButton from 'vue-material-design-icons/Stop.vue'
 import axios from '@nextcloud/axios'
+import { decodeUrl } from '../../utils/url.js'
 import { formatTimer } from '../../utils/time.js'
 import { generateUrl } from '@nextcloud/router'
 import moment from '@nextcloud/moment'
@@ -85,7 +86,7 @@ export default {
 			return this.$store.state.player.episode
 		},
 		url() {
-			return atob(this.$route.params.url)
+			return decodeUrl(this.$route.params.url)
 		},
 	},
 	async mounted() {
diff --git a/src/components/Player/Infos.vue b/src/components/Player/Infos.vue
index a2cc3b0..8683525 100644
--- a/src/components/Player/Infos.vue
+++ b/src/components/Player/Infos.vue
@@ -10,6 +10,8 @@
 </template>
 
 <script>
+import { encodeUrl } from '../../utils/url.js'
+
 export default {
 	name: 'Infos',
 	computed: {
@@ -19,7 +21,7 @@ export default {
 	},
 	methods: {
 		toUrl(url) {
-			return `/${btoa(url)}`
+			return `/${encodeUrl(url)}`
 		},
 	},
 }
diff --git a/src/components/Sidebar/Item.vue b/src/components/Sidebar/Item.vue
index 36601ce..8e90c4b 100644
--- a/src/components/Sidebar/Item.vue
+++ b/src/components/Sidebar/Item.vue
@@ -25,6 +25,7 @@ import { NcActionButton, NcAppNavigationItem, NcAvatar } from '@nextcloud/vue'
 import Alert from 'vue-material-design-icons/Alert.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 import axios from '@nextcloud/axios'
+import { encodeUrl } from '../../utils/url.js'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
@@ -52,7 +53,7 @@ export default {
 	},
 	computed: {
 		toUrl() {
-			return `/${btoa(this.url)}`
+			return `/${encodeUrl(this.url)}`
 		},
 	},
 	async mounted() {
diff --git a/src/utils/url.js b/src/utils/url.js
new file mode 100644
index 0000000..62ba464
--- /dev/null
+++ b/src/utils/url.js
@@ -0,0 +1,2 @@
+export const encodeUrl = (url) => encodeURIComponent(btoa(url))
+export const decodeUrl = (url) => atob(decodeURIComponent(url))