refactor: ♻️ typescript ok, need tests

lib/Controller/PageController.php

@@ -26,7 +26,7 @@ class PageController extends Controller
 	 * @NoCSRFRequired
 	 */
 	public function index(): TemplateResponse {
-		Util::addScript(Application::APP_ID, 'main');
+		Util::addScript(Application::APP_ID, Application::APP_ID . '-main');
 
 		$csp = new ContentSecurityPolicy();
 		$csp->addAllowedImageDomain('*');

package.json

@@ -1,6 +1,7 @@
 {
   "name": "repod",
   "license": "AGPL-3.0-or-later",
+  "type": "module",
   "scripts": {
     "build": "vue-tsc && vite build --mode production",
     "dev": "vite build --mode development",
@@ -11,9 +12,6 @@
     "stylelint": "stylelint src/**/*.vue src/**/*.scss src/**/*.css",
     "stylelint:fix": "stylelint src/**/*.vue src/**/*.scss src/**/*.css --fix"
   },
-  "browserslist": [
-    "extends @nextcloud/browserslist-config"
-  ],
   "prettier": "@nextcloud/prettier-config",
   "dependencies": {
     "@nextcloud/axios": "^2.5.0",
@@ -48,5 +46,8 @@
     "typescript": "5.5.4",
     "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.1.6"
-  }
+  },
+  "browserslist": [
+    "extends @nextcloud/browserslist-config"
+  ]
 }

src/App.vue

@@ -7,7 +7,7 @@
 	</NcContent>
 </template>
 
-<script>
+<script lang="ts">
 import 'toastify-js/src/toastify.css'
 import { mapActions, mapState } from 'pinia'
 import Bar from './components/Player/Bar.vue'

src/components/Discover/Toplist.vue

@@ -51,8 +51,8 @@ export default {
 	async mounted() {
 		try {
 			this.loading = true
-			const tops = await axios.get(
+			const tops = await axios.get<PodcastDataInterface[]>(
-				generateUrl(`/apps/repod/toplist/${this.type}`),
+				generateUrl('/apps/repod/toplist/{type}', { type: this.type }),
 			)
 			this.tops = tops.data
 		} catch (e) {

src/components/Feed/Banner.vue

@@ -1,13 +1,13 @@
 <template>
 	<div class="header">
-		<img class="background" :src="imageUrl" />
+		<img class="background" :src="feed.imageUrl" />
 		<div class="content">
 			<div>
 				<NcAvatar
-					:display-name="author || title"
+					:display-name="feed.author || feed.title"
 					:is-no-user="true"
 					:size="128"
-					:url="imageUrl" />
+					:url="feed.imageUrl" />
 				<a class="feed" :href="url" @click.prevent="copyFeed">
 					<RssIcon :size="20" />
 					<i>{{ t('repod', 'Copy feed') }}</i>
@@ -15,12 +15,12 @@
 			</div>
 			<div class="inner">
 				<div class="infos">
-					<h2>{{ title }}</h2>
+					<h2>{{ feed.title }}</h2>
-					<a :href="link" target="_blank">
+					<a :href="feed.link" target="_blank">
-						<i>{{ author }}</i>
+						<i>{{ feed.author }}</i>
 					</a>
 					<br /><br />
-					<SafeHtml :source="description" />
+					<SafeHtml :source="feed.description || ''" />
 				</div>
 				<NcAppNavigationNew
 					v-if="!getSubByUrl(url)"
@@ -40,6 +40,7 @@ import { NcAppNavigationNew, NcAvatar } from '@nextcloud/vue'
 import { mapActions, mapState } from 'pinia'
 import { showError, showSuccess } from '../../utils/toast.ts'
 import PlusIcon from 'vue-material-design-icons/Plus.vue'
+import type { PodcastDataInterface } from '../../utils/types.ts'
 import RssIcon from 'vue-material-design-icons/Rss.vue'
 import SafeHtml from '../Atoms/SafeHtml.vue'
 import axios from '@nextcloud/axios'
@@ -58,24 +59,8 @@ export default {
 		SafeHtml,
 	},
 	props: {
-		author: {
+		feed: {
-			type: String,
+			type: Object as () => PodcastDataInterface,
-			required: true,
-		},
-		description: {
-			type: String,
-			required: true,
-		},
-		imageUrl: {
-			type: String,
-			required: true,
-		},
-		link: {
-			type: String,
-			required: true,
-		},
-		title: {
-			type: String,
 			required: true,
 		},
 	},

src/components/Feed/Episodes.vue

@@ -71,15 +71,15 @@ export default {
 	async mounted() {
 		try {
 			this.loading = true
-			const episodes = await axios.get(
+			const episodes = await axios.get<EpisodeInterface[]>(
 				generateUrl('/apps/repod/episodes/list?url={url}', {
 					url: this.url,
 				}),
 			)
 			this.episodes = [...episodes.data].sort(
 				(a, b) =>
-					new Date(b.pubDate?.date).getTime() -
+					new Date(b.pubDate?.date || '').getTime() -
-					new Date(a.pubDate?.date).getTime(),
+					new Date(a.pubDate?.date || '').getTime(),
 			)
 		} catch (e) {
 			console.error(e)

src/components/Feed/Favorite.vue

@@ -1,15 +1,15 @@
 <template>
 	<NcGuestContent class="guest">
-		<Loading v-if="!currentFavoriteData" />
+		<Loading v-if="!feed.data" />
 		<NcAvatar
-			v-if="currentFavoriteData"
+			v-if="feed.data"
 			class="avatar"
-			:display-name="currentFavoriteData.author || currentFavoriteData.title"
+			:display-name="feed.data.author || feed.data.title"
 			:is-no-user="true"
 			:size="222"
-			:url="currentFavoriteData.imageUrl" />
+			:url="feed.data.imageUrl" />
-		<div v-if="currentFavoriteData" class="list">
+		<div v-if="feed.data" class="list">
-			<h2 class="title">{{ currentFavoriteData.title }}</h2>
+			<h2 class="title">{{ feed.data.title }}</h2>
 			<Loading v-if="loading" />
 			<ul v-if="!loading">
 				<Episode
@@ -17,24 +17,22 @@
 					:key="episode.guid"
 					:episode="episode"
 					:one-line="true"
-					:url="url" />
+					:url="feed.metrics.url" />
 			</ul>
 		</div>
 	</NcGuestContent>
 </template>
 
 <script lang="ts">
+import type { EpisodeInterface, SubscriptionInterface } from '../../utils/types.ts'
 import { NcAvatar, NcGuestContent } from '@nextcloud/vue'
 import Episode from './Episode.vue'
-import type { EpisodeInterface } from '../../utils/types.ts'
 import Loading from '../Atoms/Loading.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { hasEnded } from '../../utils/status.ts'
-import { mapState } from 'pinia'
 import { showError } from '../../utils/toast.ts'
 import { t } from '@nextcloud/l10n'
-import { useSubscriptions } from '../../store/subscriptions.ts'
 
 export default {
 	name: 'Favorite',
@@ -45,8 +43,8 @@ export default {
 		NcGuestContent,
 	},
 	props: {
-		url: {
+		feed: {
-			type: String,
+			type: Object as () => SubscriptionInterface,
 			required: true,
 		},
 	},
@@ -54,25 +52,19 @@ export default {
 		episodes: [] as EpisodeInterface[],
 		loading: true,
 	}),
-	computed: {
-		...mapState(useSubscriptions, ['getSubByUrl']),
-		currentFavoriteData() {
-			return this.getSubByUrl(this.url)?.data
-		},
-	},
 	async mounted() {
 		try {
 			this.loading = true
-			const episodes = await axios.get(
+			const episodes = await axios.get<EpisodeInterface[]>(
 				generateUrl('/apps/repod/episodes/list?url={url}', {
-					url: this.url,
+					url: this.feed.metrics.url,
 				}),
 			)
 			this.episodes = [...episodes.data]
 				.sort(
 					(a, b) =>
-						new Date(b.pubDate?.date).getTime() -
+						new Date(b.pubDate?.date || '').getTime() -
-						new Date(a.pubDate?.date).getTime(),
+						new Date(a.pubDate?.date || '').getTime(),
 				)
 				.filter((episode) => !this.hasEnded(episode))
 				.slice(0, 4)

src/components/Settings/Export.vue

@@ -8,10 +8,11 @@
 	</NcAppNavigationItem>
 </template>
 
-<script>
+<script lang="ts">
 import ExportIcon from 'vue-material-design-icons/Export.vue'
 import { NcAppNavigationItem } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
+import { t } from '@nextcloud/l10n'
 
 export default {
 	name: 'Export',
@@ -21,6 +22,7 @@ export default {
 	},
 	methods: {
 		generateUrl,
+		t,
 	},
 }
 </script>

src/components/Settings/Filters.vue

@@ -39,11 +39,12 @@
 	</NcAppNavigationItem>
 </template>
 
-<script>
+<script lang="ts">
 import { NcActionCheckbox, NcAppNavigationItem } from '@nextcloud/vue'
 import { mapActions, mapState } from 'pinia'
 import FilterIcon from 'vue-material-design-icons/Filter.vue'
 import FilterSettingsIcon from 'vue-material-design-icons/FilterSettings.vue'
+import { t } from '@nextcloud/l10n'
 import { useSettings } from '../../store/settings.ts'
 
 export default {
@@ -66,6 +67,7 @@ export default {
 	},
 	methods: {
 		...mapActions(useSettings, ['setFilters']),
+		t,
 	},
 }
 </script>

src/components/Settings/Import.vue

@@ -29,12 +29,13 @@
 	</NcAppNavigationItem>
 </template>
 
-<script>
+<script lang="ts">
 import { NcAppNavigationItem, NcModal } from '@nextcloud/vue'
 import ImportIcon from 'vue-material-design-icons/Import.vue'
 import Loading from '../Atoms/Loading.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
+import { t } from '@nextcloud/l10n'
 
 export default {
 	name: 'Import',
@@ -50,11 +51,13 @@ export default {
 	}),
 	methods: {
 		generateUrl,
-		async importOpml(event) {
+		t,
+		async importOpml(event: Event) {
 			try {
-				const formData = new FormData(event.target)
+				const target = event.target as HTMLFormElement
-				this.importLoading = true
+				const formData = new FormData(target)
-				await axios.post(event.target.action, formData)
+				this.loading = true
+				await axios.post(target.action, formData)
 			} catch (e) {
 				console.error(e)
 			} finally {

src/components/Settings/Rate.vue

@@ -8,9 +8,10 @@
 	</NcAppNavigationItem>
 </template>
 
-<script>
+<script lang="ts">
 import { NcAppNavigationItem } from '@nextcloud/vue'
 import StarIcon from 'vue-material-design-icons/Star.vue'
+import { t } from '@nextcloud/l10n'
 
 export default {
 	name: 'Rate',
@@ -18,5 +19,8 @@ export default {
 		NcAppNavigationItem,
 		StarIcon,
 	},
+	methods: {
+		t,
+	},
 }
 </script>

src/components/Settings/Settings.vue

@@ -8,7 +8,7 @@
 	</NcAppNavigationSettings>
 </template>
 
-<script>
+<script lang="ts">
 import Export from './Export.vue'
 import Filters from './Filters.vue'
 import Import from './Import.vue'

src/components/Settings/Speed.vue

@@ -15,7 +15,7 @@
 	</NcAppNavigationItem>
 </template>
 
-<script>
+<script lang="ts">
 import { NcAppNavigationItem, NcCounterBubble } from '@nextcloud/vue'
 import { mapActions, mapState } from 'pinia'
 import MinusIcon from 'vue-material-design-icons/Minus.vue'
@@ -23,6 +23,7 @@ import PlusIcon from 'vue-material-design-icons/Plus.vue'
 import SpeedometerIcon from 'vue-material-design-icons/Speedometer.vue'
 import SpeedometerMediumIcon from 'vue-material-design-icons/SpeedometerMedium.vue'
 import SpeedometerSlowIcon from 'vue-material-design-icons/SpeedometerSlow.vue'
+import { t } from '@nextcloud/l10n'
 import { usePlayer } from '../../store/player.ts'
 
 export default {
@@ -41,8 +42,9 @@ export default {
 	},
 	methods: {
 		...mapActions(usePlayer, ['setRate']),
-		changeRate(diff) {
+		t,
-			const newRate = (this.rate + diff).toPrecision(2)
+		changeRate(diff: number) {
+			const newRate = parseFloat((this.rate + diff).toPrecision(2))
 			this.setRate(newRate > 0 ? newRate : this.rate)
 		},
 	},

src/components/Sidebar/Subscription.vue

@@ -1,18 +1,18 @@
 <template>
 	<NcAppNavigationItem
 		:loading="loading"
-		:name="feed ? feed.title : url"
+		:name="feed?.data?.title || url"
 		:to="toFeedUrl(url)">
 		<template #actions>
 			<NcActionButton
 				:aria-label="t('repod', 'Favorite')"
-				:model-value="isFavorite"
+				:model-value="feed?.isFavorite"
 				:name="t('repod', 'Favorite')"
 				:title="t('repod', 'Favorite')"
 				@update:modelValue="switchFavorite($event)">
 				<template #icon>
-					<StarPlusIcon v-if="!isFavorite" :size="20" />
+					<StarPlusIcon v-if="!feed?.isFavorite" :size="20" />
-					<StarRemoveIcon v-if="isFavorite" :size="20" />
+					<StarRemoveIcon v-if="feed?.isFavorite" :size="20" />
 				</template>
 			</NcActionButton>
 			<NcActionButton
@@ -27,27 +27,28 @@
 		</template>
 		<template #icon>
 			<NcAvatar
-				v-if="feed"
+				:display-name="feed?.data?.author || feed?.data?.title"
-				:display-name="feed.author || feed.title"
 				:is-no-user="true"
-				:url="feed.imageUrl" />
+				:url="feed?.data?.imageUrl" />
-			<StarIcon v-if="feed && isFavorite" class="star" :size="20" />
+			<StarIcon v-if="feed?.isFavorite" class="star" :size="20" />
 			<AlertIcon v-if="failed" />
 		</template>
 	</NcAppNavigationItem>
 </template>
 
-<script>
+<script lang="ts">
 import { NcActionButton, NcAppNavigationItem, NcAvatar } from '@nextcloud/vue'
 import { mapActions, mapState } from 'pinia'
 import AlertIcon from 'vue-material-design-icons/Alert.vue'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
+import type { PersonalSettingsPodcastDataInterface } from '../../utils/types.ts'
 import StarIcon from 'vue-material-design-icons/Star.vue'
 import StarPlusIcon from 'vue-material-design-icons/StarPlus.vue'
 import StarRemoveIcon from 'vue-material-design-icons/StarRemove.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '../../utils/toast.ts'
+import { t } from '@nextcloud/l10n'
 import { toFeedUrl } from '../../utils/url.ts'
 import { useSubscriptions } from '../../store/subscriptions.ts'
 
@@ -72,17 +73,17 @@ export default {
 	data: () => ({
 		failed: false,
 		loading: true,
-		feed: null,
 	}),
 	computed: {
-		...mapState(useSubscriptions, ['getFavorites']),
+		...mapState(useSubscriptions, ['subs']),
-		isFavorite() {
+		feed() {
-			return this.getFavorites.map((fav) => fav.url).includes(this.url)
+			return this.subs.find((sub) => sub.metrics.url === this.url)
 		},
 	},
 	async mounted() {
 		try {
-			const podcastData = await axios.get(
+			const podcastData =
+				await axios.get<PersonalSettingsPodcastDataInterface>(
 					generateUrl(
 						'/apps/gpoddersync/personal_settings/podcast_data?url={url}',
 						{
@@ -90,8 +91,7 @@ export default {
 						},
 					),
 				)
-			this.feed = podcastData.data.data
+			this.addFavoriteData(podcastData.data.data)
-			this.editFavoriteData(this.url, podcastData.data.data)
 		} catch (e) {
 			this.failed = true
 			console.error(e)
@@ -100,12 +100,8 @@ export default {
 		}
 	},
 	methods: {
-		...mapActions(useSubscriptions, [
+		...mapActions(useSubscriptions, ['fetch', 'addFavoriteData', 'setFavorite']),
-			'fetch',
+		t,
-			'addFavorite',
-			'editFavoriteData',
-			'removeFavorite',
-		]),
 		toFeedUrl,
 		async deleteSubscription() {
 			if (
@@ -123,23 +119,20 @@ export default {
 					console.error(e)
 					showError(t('repod', 'Error while removing the feed'))
 				} finally {
-					this.removeFavorite(this.url)
+					this.setFavorite(this.url, false)
 					this.loading = false
 					this.fetch()
 				}
 			}
 		},
-		switchFavorite(value) {
+		switchFavorite(value: boolean) {
 			if (value) {
-				if (this.getFavorites.length >= 10) {
+				if (this.subs.filter((sub) => sub.isFavorite).length >= 10) {
 					showError(t('repod', 'You can only have 10 favorites'))
 					return
 				}
-
-				this.addFavorite(this.url)
-			} else {
-				this.removeFavorite(this.url)
 			}
+			this.setFavorite(this.url, value)
 		},
 	},
 }

src/components/Sidebar/Subscriptions.vue

@@ -12,16 +12,13 @@
 				<Loading v-if="loading" />
 				<NcAppNavigationList v-if="!loading">
 					<Subscription
-						v-for="url of getFavorites.map((fav) => fav.url)"
+						v-for="sub of subs.filter((sub) => sub.isFavorite)"
-						:key="url"
+						:key="sub.metrics.url"
-						:url="url" />
+						:url="sub.metrics.url" />
 					<Subscription
-						v-for="url of getSubscriptions.filter(
+						v-for="sub of subs.filter((sub) => !sub.isFavorite)"
-							(sub) =>
+						:key="sub.metrics.url"
-								!getFavorites.map((fav) => fav.url).includes(sub),
+						:url="sub.metrics.url" />
-						)"
-						:key="url"
-						:url="url" />
 				</NcAppNavigationList>
 			</NcAppContentList>
 		</template>
@@ -31,7 +28,7 @@
 	</AppNavigation>
 </template>
 
-<script>
+<script lang="ts">
 import {
 	NcAppContentList,
 	NcAppNavigationList,
@@ -44,6 +41,7 @@ import PlusIcon from 'vue-material-design-icons/Plus.vue'
 import Settings from '../Settings/Settings.vue'
 import Subscription from './Subscription.vue'
 import { showError } from '../../utils/toast.ts'
+import { t } from '@nextcloud/l10n'
 import { useSubscriptions } from '../../store/subscriptions.ts'
 
 export default {
@@ -62,7 +60,7 @@ export default {
 		loading: true,
 	}),
 	computed: {
-		...mapState(useSubscriptions, ['getSubscriptions', 'getFavorites']),
+		...mapState(useSubscriptions, ['subs']),
 	},
 	async mounted() {
 		try {
@@ -76,6 +74,7 @@ export default {
 	},
 	methods: {
 		...mapActions(useSubscriptions, ['fetch']),
+		t,
 	},
 }
 </script>

src/store/player.ts

@@ -1,4 +1,4 @@
-import type { EpisodeInterface } from '../utils/types'
+import type { EpisodeActionInterface, EpisodeInterface } from '../utils/types'
 import axios from '@nextcloud/axios'
 import { defineStore } from 'pinia'
 import { formatEpisodeTimestamp } from '../utils/time'
@@ -39,7 +39,7 @@ export const usePlayer = defineStore('player', {
 				audio.load()
 
 				try {
-					const action = await axios.get(
+					const action = await axios.get<EpisodeActionInterface>(
 						generateUrl('/apps/repod/episodes/action?url={url}', {
 							url: this.episode.url,
 						}),

src/store/settings.ts

@@ -24,7 +24,7 @@ export const useSettings = defineStore('settings', {
 		}
 	},
 	actions: {
-		setFilters(filters: FiltersInterface) {
+		setFilters(filters: Partial<FiltersInterface>) {
 			this.filters = { ...this.filters, ...filters }
 			setCookie('repod.filters', JSON.stringify(this.filters), 365)
 		},

src/store/subscriptions.ts

@@ -1,6 +1,6 @@
 import type {
+	PersonalSettingsMetricsInterface,
 	PodcastDataInterface,
-	PodcastMetricsInterface,
 	SubscriptionInterface,
 } from '../utils/types'
 import { getCookie, setCookie } from '../utils/cookies'
@@ -23,7 +23,7 @@ export const useSubscriptions = defineStore('subscriptions', {
 				favorites = JSON.parse(getCookie('repod.favorites') || '[]') || []
 			} catch {}
 
-			const metrics = await axios.get<PodcastMetricsInterface>(
+			const metrics = await axios.get<PersonalSettingsMetricsInterface>(
 				generateUrl('/apps/gpoddersync/personal_settings/metrics'),
 			)
 			this.subs = [...metrics.data.subscriptions]

src/utils/types.ts

@@ -47,8 +47,6 @@ export interface PodcastDataInterface {
 }
 
 export interface PodcastMetricsInterface {
-	subscriptions: [
-		{
 	url: string
 	listenedSeconds: number
 	actionCounts: {
@@ -58,12 +56,18 @@ export interface PodcastMetricsInterface {
 		new: number
 		play: number
 	}
-		},
-	]
 }
 
 export interface SubscriptionInterface {
 	data?: PodcastDataInterface
 	isFavorite: boolean
-	metrics: PodcastMetricsInterface['subscriptions'][0]
+	metrics: PodcastMetricsInterface
+}
+
+export interface PersonalSettingsMetricsInterface {
+	subscriptions: PodcastMetricsInterface[]
+}
+
+export interface PersonalSettingsPodcastDataInterface {
+	data: PodcastDataInterface
 }

src/views/Discover.vue

@@ -12,13 +12,14 @@
 	</AppContent>
 </template>
 
-<script>
+<script lang="ts">
 import AddRss from '../components/Discover/AddRss.vue'
 import AppContent from '../components/Atoms/AppContent.vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
 import { NcTextField } from '@nextcloud/vue'
 import Search from '../components/Discover/Search.vue'
 import Toplist from '../components/Discover/Toplist.vue'
+import { t } from '@nextcloud/l10n'
 
 export default {
 	name: 'Discover',
@@ -33,6 +34,9 @@ export default {
 	data: () => ({
 		search: '',
 	}),
+	methods: {
+		t,
+	},
 }
 </script>
 

src/views/Feed.vue

@@ -6,27 +6,23 @@
 				<Alert />
 			</template>
 		</EmptyContent>
-		<Banner
+		<Banner v-if="feed" :feed="feed" />
-			v-if="feed"
-			:author="feed.author"
-			:description="feed.description"
-			:image-url="feed.imageUrl"
-			:link="feed.link"
-			:title="feed.title" />
 		<Episodes v-if="feed" />
 	</AppContent>
 </template>
 
-<script>
+<script lang="ts">
 import Alert from 'vue-material-design-icons/Alert.vue'
 import AppContent from '../components/Atoms/AppContent.vue'
 import Banner from '../components/Feed/Banner.vue'
 import EmptyContent from '../components/Atoms/EmptyContent.vue'
 import Episodes from '../components/Feed/Episodes.vue'
 import Loading from '../components/Atoms/Loading.vue'
+import type { PodcastDataInterface } from '../utils/types.ts'
 import axios from '@nextcloud/axios'
 import { decodeUrl } from '../utils/url.ts'
 import { generateUrl } from '@nextcloud/router'
+import { t } from '@nextcloud/l10n'
 
 export default {
 	name: 'Feed',
@@ -41,16 +37,17 @@ export default {
 	data: () => ({
 		failed: false,
 		loading: true,
-		feed: null,
+		feed: null as PodcastDataInterface | null,
 	}),
 	computed: {
 		url() {
-			return decodeUrl(this.$route.params.url)
+			return decodeUrl(this.$route.params.url as string)
 		},
 	},
 	async mounted() {
 		try {
-			const podcastData = await axios.get(
+			this.loading = true
+			const podcastData = await axios.get<PodcastDataInterface>(
 				generateUrl('/apps/repod/podcast?url={url}', { url: this.url }),
 			)
 			this.feed = podcastData.data
@@ -61,5 +58,8 @@ export default {
 			this.loading = false
 		}
 	},
+	methods: {
+		t,
+	},
 }
 </script>

src/views/GPodder.vue

@@ -13,12 +13,13 @@
 	</AppContent>
 </template>
 
-<script>
+<script lang="ts">
 import Alert from 'vue-material-design-icons/Alert.vue'
 import AppContent from '../components/Atoms/AppContent.vue'
 import EmptyContent from '../components/Atoms/EmptyContent.vue'
 import { NcButton } from '@nextcloud/vue'
 import { generateUrl } from '@nextcloud/router'
+import { t } from '@nextcloud/l10n'
 
 export default {
 	name: 'GPodder',
@@ -33,5 +34,8 @@ export default {
 			return generateUrl('/settings/apps/installed/gpoddersync')
 		},
 	},
+	methods: {
+		t,
+	},
 }
 </script>

src/views/Home.vue

@@ -1,7 +1,7 @@
 <template>
 	<AppContent>
 		<EmptyContent
-			v-if="!getFavorites.length"
+			v-if="!favorites.length"
 			:description="
 				t('repod', 'Pin some subscriptions to see their latest updates')
 			"
@@ -10,20 +10,21 @@
 				<StarOffIcon />
 			</template>
 		</EmptyContent>
-		<ul v-if="getFavorites.length">
+		<ul v-if="favorites.length">
-			<li v-for="url in getFavorites.map((fav) => fav.url)" :key="url">
+			<li v-for="favorite in favorites" :key="favorite.metrics.url">
-				<Favorite :url="url" />
+				<Favorite :feed="favorite" />
 			</li>
 		</ul>
 	</AppContent>
 </template>
 
-<script>
+<script lang="ts">
 import AppContent from '../components/Atoms/AppContent.vue'
 import EmptyContent from '../components/Atoms/EmptyContent.vue'
 import Favorite from '../components/Feed/Favorite.vue'
 import StarOffIcon from 'vue-material-design-icons/StarOff.vue'
 import { mapState } from 'pinia'
+import { t } from '@nextcloud/l10n'
 import { useSubscriptions } from '../store/subscriptions.ts'
 
 export default {
@@ -35,7 +36,13 @@ export default {
 		StarOffIcon,
 	},
 	computed: {
-		...mapState(useSubscriptions, ['getFavorites']),
+		...mapState(useSubscriptions, ['subs']),
+		favorites() {
+			return this.subs.filter((sub) => sub.isFavorite)
+		},
+	},
+	methods: {
+		t,
 	},
 }
 </script>

vite.config.ts

@@ -4,11 +4,6 @@ import vueDevTools from 'vite-plugin-vue-devtools'
 
 const config = defineConfig(({ mode }) => ({
 	build: {
-		rollupOptions: {
-			output: {
-				entryFileNames: 'js/[name].js',
-			},
-		},
 		sourcemap: mode !== 'production',
 	},
 	define: {