From 5ed33d1cf63b35d9714d47030e9606d8a0d1c165 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Tue, 27 Aug 2024 09:42:52 +0200
Subject: [PATCH] refactor: :truck: rework how routing works

---
 appinfo/routes.php                  |  1 +
 lib/Controller/PageController.php   |  8 ++++++++
 src/components/Discover/AddRss.vue  |  8 +++-----
 src/components/Discover/Search.vue  |  6 +++---
 src/components/Discover/Toplist.vue |  6 +++---
 src/components/Feed/Episodes.vue    |  1 -
 src/components/Player/Infos.vue     | 10 +++++-----
 src/components/Sidebar/Item.vue     |  8 +++-----
 src/router.js                       |  6 +++---
 src/utils/url.js                    |  2 +-
 10 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 5235527..f45110e 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
+		['name' => 'page#feed', 'url' => '/feed/{path}', 'verb' => 'GET', 'requirements' => ['path' => '.+']],
 		['name' => 'episodes#action', 'url' => '/episodes/action', 'verb' => 'GET'],
 		['name' => 'episodes#list', 'url' => '/episodes/list', 'verb' => 'GET'],
 		['name' => 'opml#export', 'url' => '/opml/export', 'verb' => 'GET'],
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 8d56ebd..7119f4a 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -44,4 +44,12 @@ class PageController extends Controller
 
 		return $response;
 	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function feed(): TemplateResponse {
+		return $this->index();
+	}
 }
diff --git a/src/components/Discover/AddRss.vue b/src/components/Discover/AddRss.vue
index 83ce990..d3fa8ed 100644
--- a/src/components/Discover/AddRss.vue
+++ b/src/components/Discover/AddRss.vue
@@ -2,7 +2,7 @@
 	<NcAppNavigationList>
 		<NcAppNavigationNewItem
 			:name="t('repod', 'Add a RSS link')"
-			@new-item="addSubscription">
+			@new-item="(url) => $router.push(toFeedUrl(url))">
 			<template #icon>
 				<PlusIcon :size="20" />
 			</template>
@@ -13,7 +13,7 @@
 <script>
 import { NcAppNavigationList, NcAppNavigationNewItem } from '@nextcloud/vue'
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
-import { encodeUrl } from '../../utils/url.js'
+import { toFeedUrl } from '../../utils/url.js'
 
 export default {
 	name: 'AddRss',
@@ -23,9 +23,7 @@ export default {
 		PlusIcon,
 	},
 	methods: {
-		addSubscription(feedUrl) {
-			this.$router.push(encodeUrl(feedUrl))
-		},
+		toFeedUrl,
 	},
 }
 </script>
diff --git a/src/components/Discover/Search.vue b/src/components/Discover/Search.vue
index 75213cc..e10d074 100644
--- a/src/components/Discover/Search.vue
+++ b/src/components/Discover/Search.vue
@@ -7,7 +7,7 @@
 				:key="feed.link"
 				:details="formatLocaleDate(new Date(feed.fetchedAtUnix * 1000))"
 				:name="feed.title"
-				:to="toUrl(feed.link)">
+				:to="toFeedUrl(feed.link)">
 				<template #icon>
 					<NcAvatar
 						:display-name="feed.author"
@@ -44,7 +44,7 @@ import { debounce } from '../../utils/debounce.js'
 import { formatLocaleDate } from '../../utils/time.js'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '../../utils/toast.js'
-import { toUrl } from '../../utils/url.js'
+import { toFeedUrl } from '../../utils/url.js'
 import { useSubscriptions } from '../../store/subscriptions.js'
 
 export default {
@@ -77,7 +77,7 @@ export default {
 	methods: {
 		...mapActions(useSubscriptions, ['fetch']),
 		formatLocaleDate,
-		toUrl,
+		toFeedUrl,
 		async addSubscription(url) {
 			try {
 				await axios.post(
diff --git a/src/components/Discover/Toplist.vue b/src/components/Discover/Toplist.vue
index cf0124d..35199ca 100644
--- a/src/components/Discover/Toplist.vue
+++ b/src/components/Discover/Toplist.vue
@@ -4,7 +4,7 @@
 		<Loading v-if="loading" />
 		<ul v-if="!loading">
 			<li v-for="top in tops" :key="top.link">
-				<router-link :to="toUrl(top.link)">
+				<router-link :to="toFeedUrl(top.link)">
 					<img :src="top.imageUrl" :title="top.author" />
 				</router-link>
 			</li>
@@ -17,7 +17,7 @@ import Loading from '../Atoms/Loading.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '../../utils/toast.js'
-import { toUrl } from '../../utils/url.js'
+import { toFeedUrl } from '../../utils/url.js'
 
 export default {
 	name: 'Toplist',
@@ -61,7 +61,7 @@ export default {
 		}
 	},
 	methods: {
-		toUrl,
+		toFeedUrl,
 	},
 }
 </script>
diff --git a/src/components/Feed/Episodes.vue b/src/components/Feed/Episodes.vue
index f51876e..e1ae46e 100644
--- a/src/components/Feed/Episodes.vue
+++ b/src/components/Feed/Episodes.vue
@@ -8,7 +8,6 @@
 				:active="isCurrentEpisode(episode)"
 				:details="formatLocaleDate(new Date(episode.pubDate?.date))"
 				:force-display-actions="true"
-				:href="$route.href"
 				:name="episode.name"
 				:style="{ opacity: hasEnded(episode) ? 0.4 : 1 }"
 				target="_self"
diff --git a/src/components/Player/Infos.vue b/src/components/Player/Infos.vue
index 6fd4da1..7240386 100644
--- a/src/components/Player/Infos.vue
+++ b/src/components/Player/Infos.vue
@@ -3,7 +3,7 @@
 		<strong class="pointer" @click="modal = true">
 			{{ episode.name }}
 		</strong>
-		<router-link :to="hash">
+		<router-link :to="toFeedUrl(podcastUrl)">
 			<i>{{ episode.title }}</i>
 		</router-link>
 		<NcModal v-if="modal" @close="modal = false">
@@ -23,7 +23,7 @@
 import Modal from '../Atoms/Modal.vue'
 import { NcModal } from '@nextcloud/vue'
 import { mapState } from 'pinia'
-import { toUrl } from '../../utils/url.js'
+import { toFeedUrl } from '../../utils/url.js'
 import { usePlayer } from '../../store/player.js'
 
 export default {
@@ -37,9 +37,9 @@ export default {
 	}),
 	computed: {
 		...mapState(usePlayer, ['episode', 'podcastUrl']),
-		hash() {
-			return toUrl(this.podcastUrl)
-		},
+	},
+	methods: {
+		toFeedUrl,
 	},
 }
 </script>
diff --git a/src/components/Sidebar/Item.vue b/src/components/Sidebar/Item.vue
index a85ac58..bd05cb0 100644
--- a/src/components/Sidebar/Item.vue
+++ b/src/components/Sidebar/Item.vue
@@ -2,7 +2,7 @@
 	<NcAppNavigationItem
 		:loading="loading"
 		:name="feed ? feed.title : url"
-		:to="hash">
+		:to="toFeedUrl(url)">
 		<template #actions>
 			<NcActionButton
 				:aria-label="t('repod', 'Favorite')"
@@ -48,7 +48,7 @@ import StarRemoveIcon from 'vue-material-design-icons/StarRemove.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '../../utils/toast.js'
-import { toUrl } from '../../utils/url.js'
+import { toFeedUrl } from '../../utils/url.js'
 import { useSubscriptions } from '../../store/subscriptions.js'
 
 export default {
@@ -76,9 +76,6 @@ export default {
 	}),
 	computed: {
 		...mapState(useSubscriptions, ['favs']),
-		hash() {
-			return toUrl(this.url)
-		},
 		isFavorite() {
 			return this.favs.map((fav) => fav.url).includes(this.url)
 		},
@@ -109,6 +106,7 @@ export default {
 			'editFavoriteData',
 			'removeFavorite',
 		]),
+		toFeedUrl,
 		async deleteSubscription() {
 			if (
 				confirm(
diff --git a/src/router.js b/src/router.js
index 7efda3d..9f77f94 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,11 +1,11 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+import { createRouter, createWebHistory } from 'vue-router'
 import Discover from './views/Discover.vue'
 import Feed from './views/Feed.vue'
 import Home from './views/Home.vue'
 import { generateUrl } from '@nextcloud/router'
 
 const router = createRouter({
-	history: createWebHashHistory(generateUrl('apps/repod')),
+	history: createWebHistory(generateUrl('apps/repod')),
 	routes: [
 		{
 			path: '/',
@@ -16,7 +16,7 @@ const router = createRouter({
 			component: Discover,
 		},
 		{
-			path: '/:url',
+			path: '/feed/:url',
 			component: Feed,
 		},
 	],
diff --git a/src/utils/url.js b/src/utils/url.js
index 688ad18..89dde9c 100644
--- a/src/utils/url.js
+++ b/src/utils/url.js
@@ -1,6 +1,6 @@
 export const encodeUrl = (url) => encodeURIComponent(btoa(url))
 export const decodeUrl = (url) => atob(decodeURIComponent(url))
-export const toUrl = (url) => `/${encodeUrl(url)}`
+export const toFeedUrl = (url) => `/feed/${encodeUrl(url)}`
 export const filenameFromUrl = (str) => {
 	const url = new URL(str)
 	return url.pathname.split('/').pop()