CHANGELOG.md

@@ -1,18 +1,3 @@
-## 3.1.0 - 2024-09-02
-
-### Added
-- ⭐ You can now add favorites subscriptions !
-It will show's up on the homepage instead of the recommendations witch appear only when you add a new subscription.
-[#59](https://git.crystalyx.net/Xefir/repod/issues/59) suggested by @W_LL_M, @Jaunty and @Satalink
-
-### Changed
-- 💥 Use html5 routing instead of hashes. All the URLs has changed removing the `#/` part.
-
-### Fixed
-- 🐛 Regression on 3.0 that prevent seeking player to episode last listened position
-[#136](https://git.crystalyx.net/Xefir/repod/issues/136) reported by @randomuser1967
-- ⚡ Improve the detection off mis-installed or mis-enabled gpodder app
-
 ## 3.0.0 - 2024-08-17
 
 ### Added

appinfo/info.xml

@@ -11,7 +11,7 @@
 
 ## Requirements
 You need to have [GPodderSync](https://apps.nextcloud.com/apps/gpoddersync) installed to use this app!]]></description>
-    <version>3.1.0</version>
+    <version>3.0.0</version>
     <licence>agpl</licence>
     <author mail="xefir@crystalyx.net" homepage="https://crystalyx.net">Michel Roux</author>
     <namespace>RePod</namespace>

appinfo/routes.php

@@ -13,8 +13,6 @@ declare(strict_types=1);
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'page#feed', 'url' => '/feed/{path}', 'verb' => 'GET', 'requirements' => ['path' => '.+']],
-		['name' => 'page#discover', 'url' => '/discover', 'verb' => 'GET'],
 		['name' => 'episodes#action', 'url' => '/episodes/action', 'verb' => 'GET'],
 		['name' => 'episodes#list', 'url' => '/episodes/list', 'verb' => 'GET'],
 		['name' => 'opml#export', 'url' => '/opml/export', 'verb' => 'GET'],

composer.json

@@ -15,9 +15,9 @@
 		"psalm": "psalm --threads=1 --no-cache --show-info=true"
 	},
 	"require-dev": {
-		"nextcloud/ocp": "^29.0.5",
+		"nextcloud/ocp": "^29.0.4",
 		"roave/security-advisories": "dev-latest",
-		"nextcloud/coding-standard": "^1.2.3",
+		"nextcloud/coding-standard": "^1.2.1",
 		"vimeo/psalm": "^5.25.0"
 	},
 	"config": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a59841dc91b50fc36ec116bab55543b0",
+    "content-hash": "855f98aa313f86222776e061139c42ec",
     "packages": [],
     "packages-dev": [
         {
@@ -169,26 +169,26 @@
         },
         {
             "name": "composer/pcre",
-            "version": "3.3.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81"
+                "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/1637e067347a0c40bbb1e3cd786b20dcab556a81",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
-                "reference": "1637e067347a0c40bbb1e3cd786b20dcab556a81",
+                "reference": "ea4ab6f9580a4fd221e0418f2c357cdd39102a90",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0"
             },
             "conflict": {
-                "phpstan/phpstan": "<1.11.10"
+                "phpstan/phpstan": "<1.11.8"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.11.10",
+                "phpstan/phpstan": "^1.11.8",
                 "phpstan/phpstan-strict-rules": "^1.1",
                 "phpunit/phpunit": "^8 || ^9"
             },
@@ -228,7 +228,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.3.0"
+                "source": "https://github.com/composer/pcre/tree/3.2.0"
             },
             "funding": [
                 {
@@ -244,7 +244,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-19T19:43:53+00:00"
+            "time": "2024-07-25T09:36:02+00:00"
         },
         {
             "name": "composer/semver",
@@ -1312,12 +1312,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "f8de2a81061775002d96aea80b12f2ab3c5eeb8d"
+                "reference": "251a4f1fefcc6e6cc90d50514fee6b6e3745cb3e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f8de2a81061775002d96aea80b12f2ab3c5eeb8d",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/251a4f1fefcc6e6cc90d50514fee6b6e3745cb3e",
-                "reference": "f8de2a81061775002d96aea80b12f2ab3c5eeb8d",
+                "reference": "251a4f1fefcc6e6cc90d50514fee6b6e3745cb3e",
                 "shasum": ""
             },
             "conflict": {
@@ -1355,7 +1355,7 @@
                 "athlon1600/php-proxy-app": "<=3",
                 "austintoddj/canvas": "<=3.4.2",
                 "auth0/wordpress": "<=4.6",
-                "automad/automad": "<2.0.0.0-alpha5",
+                "automad/automad": "<=2.0.0.0-alpha5",
                 "automattic/jetpack": "<9.8",
                 "awesome-support/awesome-support": "<=6.0.7",
                 "aws/aws-sdk-php": "<3.288.1",
@@ -1528,7 +1528,7 @@
                 "friendsoftypo3/mediace": ">=7.6.2,<7.6.5",
                 "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6",
                 "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.3",
-                "froxlor/froxlor": "<=2.2.0.0-RC3",
+                "froxlor/froxlor": "<2.1.9",
                 "frozennode/administrator": "<=5.0.12",
                 "fuel/core": "<1.8.1",
                 "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3",
@@ -2121,7 +2121,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-23T19:04:38+00:00"
+            "time": "2024-08-14T19:05:08+00:00"
         },
         {
             "name": "sebastian/diff",

l10n/de.js

@@ -18,10 +18,11 @@ OC.L10N.register(
     "Link copied to the clipboard" : "Der Link des Feeds wurde in die Zwischenablage kopiert",
     "Play" : "Abspielen",
     "Stop" : "Stopp",
-    "Read" : "Gelesen",
+    "Mark as read" : "Als gelesen markieren",
+    "Mark as unread" : "Als ungelesen markieren",
     "Open website" : "Webseite aufrufen",
-    "Could not change the status of the episode" : "Kann den Status der Folge nicht ändern",
     "Could not fetch episodes" : "Folgen können nicht abgerufen werden",
+    "Could not change the status of the episode" : "Kann den Status der Folge nicht ändern",
     "Export subscriptions" : "Abonnements exportieren",
     "Filtering episodes" : "Folgen filtern",
     "Show all" : "Zeige alles",
@@ -32,17 +33,13 @@ OC.L10N.register(
     "Import OPML file" : "Importiere OPML-Datei",
     "Rate RePod ❤️" : "Bewerte RePod ❤️",
     "Playback speed" : "Wiedergabegeschwindigkeit",
-    "Favorite" : "Favorit",
     "Are you sure you want to delete this subscription?" : "Bist Du sicher, dass Du das Abonnement löschen möchtest?",
     "Error while removing the feed" : "Fehler beim Löschen des Feeds",
-    "You can only have 10 favorites" : "Du kannst nur 10 Favoriten haben",
     "Add a podcast" : "Einen Podcast hinzufügen",
     "Could not fetch subscriptions" : "Abonnements können nicht abgerufen werden",
     "Find a podcast" : "Finde einen Podcast",
     "Error loading feed" : "Fehler beim Laden des Feeds",
     "Missing required app" : "Benötigte App fehlt",
-    "Install GPodder Sync" : "Installiere GPodder Sync",
+    "Install GPodder Sync" : "Installiere GPodder Sync"
-    "Pin some subscriptions to see their latest updates" : "Pinne einige Abonnements, um ihre neuesten Updates zu sehen",
-    "No favorites" : "Keine Favoriten"
 },
 "");

l10n/de.json

@@ -16,10 +16,11 @@
     "Link copied to the clipboard" : "Der Link des Feeds wurde in die Zwischenablage kopiert",
     "Play" : "Abspielen",
     "Stop" : "Stopp",
-    "Read" : "Gelesen",
+    "Mark as read" : "Als gelesen markieren",
+    "Mark as unread" : "Als ungelesen markieren",
     "Open website" : "Webseite aufrufen",
-    "Could not change the status of the episode" : "Kann den Status der Folge nicht ändern",
     "Could not fetch episodes" : "Folgen können nicht abgerufen werden",
+    "Could not change the status of the episode" : "Kann den Status der Folge nicht ändern",
     "Export subscriptions" : "Abonnements exportieren",
     "Filtering episodes" : "Folgen filtern",
     "Show all" : "Zeige alles",
@@ -30,17 +31,13 @@
     "Import OPML file" : "Importiere OPML-Datei",
     "Rate RePod ❤️" : "Bewerte RePod ❤️",
     "Playback speed" : "Wiedergabegeschwindigkeit",
-    "Favorite" : "Favorit",
     "Are you sure you want to delete this subscription?" : "Bist Du sicher, dass Du das Abonnement löschen möchtest?",
     "Error while removing the feed" : "Fehler beim Löschen des Feeds",
-    "You can only have 10 favorites" : "Du kannst nur 10 Favoriten haben",
     "Add a podcast" : "Einen Podcast hinzufügen",
     "Could not fetch subscriptions" : "Abonnements können nicht abgerufen werden",
     "Find a podcast" : "Finde einen Podcast",
     "Error loading feed" : "Fehler beim Laden des Feeds",
     "Missing required app" : "Benötigte App fehlt",
-    "Install GPodder Sync" : "Installiere GPodder Sync",
+    "Install GPodder Sync" : "Installiere GPodder Sync"
-    "Pin some subscriptions to see their latest updates" : "Pinne einige Abonnements, um ihre neuesten Updates zu sehen",
-    "No favorites" : "Keine Favoriten"
 },"pluralForm" :""
 }

l10n/fr.js

@@ -18,10 +18,11 @@ OC.L10N.register(
     "Link copied to the clipboard" : "Lien vers le flux copié dans le presse-papiers",
     "Play" : "Lecture",
     "Stop" : "Arrêter",
-    "Read" : "Lu",
+    "Mark as read" : "Marquer comme lu",
+    "Mark as unread" : "Marquer comme non lu",
     "Open website" : "Ouvrir le site web",
-    "Could not change the status of the episode" : "Impossible de changer le status de l'épisode",
     "Could not fetch episodes" : "Impossible de récuprer les épisodes",
+    "Could not change the status of the episode" : "Impossible de changer le status de l'épisode",
     "Export subscriptions" : "Exporter les abonnements",
     "Filtering episodes" : "Filtrage des épisodes",
     "Show all" : "Montrer tout",
@@ -32,17 +33,13 @@ OC.L10N.register(
     "Import OPML file" : "Importer un fichier OPML",
     "Rate RePod ❤️" : "Donnez votre avis ❤️",
     "Playback speed" : "Vitesse de lecture",
-    "Favorite" : "Favori",
     "Are you sure you want to delete this subscription?" : "Êtes-vous sûr de vouloir supprimer ce flux ?",
     "Error while removing the feed" : "Erreur lors de la suppression du flux",
-    "You can only have 10 favorites" : "Vous ne pouvez avoir que 10 favoris",
     "Add a podcast" : "Ajouter un podcast",
     "Could not fetch subscriptions" : "Impossible de récupérer les flux",
     "Find a podcast" : "Chercher un podcast",
     "Error loading feed" : "Erreur lors du chargement du flux",
     "Missing required app" : "Une application requise est manquante",
-    "Install GPodder Sync" : "Installer GPodder Sync",
+    "Install GPodder Sync" : "Installer GPodder Sync"
-    "Pin some subscriptions to see their latest updates" : "Ajoutez des abonnements en favoris pour obtenir les dernières nouvelles ici",
-    "No favorites" : "Aucun favoris"
 },
 "");

l10n/fr.json

@@ -16,10 +16,11 @@
     "Link copied to the clipboard" : "Lien vers le flux copié dans le presse-papiers",
     "Play" : "Lecture",
     "Stop" : "Arrêter",
-    "Read" : "Lu",
+    "Mark as read" : "Marquer comme lu",
+    "Mark as unread" : "Marquer comme non lu",
     "Open website" : "Ouvrir le site web",
-    "Could not change the status of the episode" : "Impossible de changer le status de l'épisode",
     "Could not fetch episodes" : "Impossible de récuprer les épisodes",
+    "Could not change the status of the episode" : "Impossible de changer le status de l'épisode",
     "Export subscriptions" : "Exporter les abonnements",
     "Filtering episodes" : "Filtrage des épisodes",
     "Show all" : "Montrer tout",
@@ -30,17 +31,13 @@
     "Import OPML file" : "Importer un fichier OPML",
     "Rate RePod ❤️" : "Donnez votre avis ❤️",
     "Playback speed" : "Vitesse de lecture",
-    "Favorite" : "Favori",
     "Are you sure you want to delete this subscription?" : "Êtes-vous sûr de vouloir supprimer ce flux ?",
     "Error while removing the feed" : "Erreur lors de la suppression du flux",
-    "You can only have 10 favorites" : "Vous ne pouvez avoir que 10 favoris",
     "Add a podcast" : "Ajouter un podcast",
     "Could not fetch subscriptions" : "Impossible de récupérer les flux",
     "Find a podcast" : "Chercher un podcast",
     "Error loading feed" : "Erreur lors du chargement du flux",
     "Missing required app" : "Une application requise est manquante",
-    "Install GPodder Sync" : "Installer GPodder Sync",
+    "Install GPodder Sync" : "Installer GPodder Sync"
-    "Pin some subscriptions to see their latest updates" : "Ajoutez des abonnements en favoris pour obtenir les dernières nouvelles ici",
-    "No favorites" : "Aucun favoris"
 },"pluralForm" :""
 }

lib/AppInfo/Application.php

@@ -32,10 +32,6 @@ class Application extends App implements IBootstrap
 		/** @var IInitialState $initialState */
 		$initialState = $appContainer->get(IInitialState::class);
 
-		if (null === $appManager->getAppInfo(self::GPODDERSYNC_ID)) {
-			$appManager->disableApp(self::GPODDERSYNC_ID);
-		}
-
 		$gpoddersync = $appManager->isEnabledForUser(self::GPODDERSYNC_ID);
 		if (!$gpoddersync) {
 			try {

lib/Controller/PageController.php

@@ -8,19 +8,10 @@ use OCA\RePod\AppInfo\Application;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
-use OCP\IRequest;
 use OCP\Util;
 
 class PageController extends Controller
 {
-	public function __construct(
-		IRequest $request,
-		private IConfig $config
-	) {
-		parent::__construct(Application::APP_ID, $request);
-	}
-
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
@@ -32,32 +23,9 @@ class PageController extends Controller
 		$csp->addAllowedImageDomain('*');
 		$csp->addAllowedMediaDomain('*');
 
-		if ($this->config->getSystemValueBool('debug', false)) {
-			/** @psalm-suppress DeprecatedMethod */
-			$csp->allowEvalScript();
-			$csp->addAllowedConnectDomain('*');
-			$csp->addAllowedScriptDomain('*');
-		}
-
 		$response = new TemplateResponse(Application::APP_ID, 'main');
 		$response->setContentSecurityPolicy($csp);
 
 		return $response;
 	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function discover(): TemplateResponse {
-		return $this->index();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function feed(): TemplateResponse {
-		return $this->index();
-	}
 }

package.json

@@ -26,7 +26,7 @@
     "linkify-html": "^4.1.3",
     "pinia": "^2.2.2",
     "toastify-js": "^1.12.0",
-    "vite": "^5.4.2",
+    "vite": "^5.4.1",
     "vue": "^3.4.38",
     "vue-material-design-icons": "^5.3.0",
     "vue-router": "^4.4.3"
@@ -37,8 +37,7 @@
     "@nextcloud/prettier-config": "^1.1.0",
     "@nextcloud/stylelint-config": "^3.0.1",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-pinia": "^0.4.1",
+    "eslint-plugin-pinia": "^0.4.0",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-prettier": "^5.2.1"
-    "vite-plugin-vue-devtools": "^7.3.9"
   }
 }

src/components/Atoms/AppContent.vue

@@ -1,5 +1,5 @@
 <template>
-	<NcAppContent :class="{ episode }">
+	<NcAppContent :class="{ padding: episode }">
 		<slot />
 	</NcAppContent>
 </template>
@@ -21,7 +21,7 @@ export default {
 </script>
 
 <style scoped>
-.episode {
+.padding {
 	padding-bottom: 6rem;
 }
 </style>

src/components/Atoms/EmptyContent.vue

@@ -1,22 +0,0 @@
-<template>
-	<NcEmptyContent class="empty">
-		<slot />
-	</NcEmptyContent>
-</template>
-
-<script>
-import { NcEmptyContent } from '@nextcloud/vue'
-
-export default {
-	name: 'EmptyContent',
-	components: {
-		NcEmptyContent,
-	},
-}
-</script>
-
-<style scoped>
-.empty {
-	height: 100%;
-}
-</style>

src/components/Atoms/Modal.vue

@@ -1,29 +1,25 @@
 <template>
 	<div class="flex">
-		<NcAvatar
+		<NcAvatar :display-name="name" :is-no-user="true" :size="256" :url="image" />
-			:display-name="episode.name"
+		<h2>{{ name }}</h2>
-			:is-no-user="true"
+		<SafeHtml :source="description" />
-			:size="256"
-			:url="episode.image" />
-		<h2>{{ episode.name }}</h2>
-		<SafeHtml :source="episode.description" />
 		<div class="flex">
-			<NcButton v-if="episode.link" :href="episode.link" target="_blank">
+			<NcButton v-if="link" :href="link" target="_blank">
 				<template #icon>
 					<OpenInNewIcon :size="20" />
 				</template>
-				{{ episode.title }}
+				{{ title }}
 			</NcButton>
 			<NcButton
-				v-if="episode.url"
+				v-if="url"
-				:download="filenameFromUrl(episode.url)"
+				:download="filenameFromUrl(url)"
-				:href="episode.url"
+				:href="url"
 				target="_blank">
 				<template #icon>
 					<DownloadIcon :size="20" />
 				</template>
 				{{ t('repod', 'Download') }}
-				{{ episode.size ? `(${humanFileSize(episode.size)})` : '' }}
+				{{ size ? `(${humanFileSize(size)})` : '' }}
 			</NcButton>
 		</div>
 	</div>
@@ -47,8 +43,32 @@ export default {
 		SafeHtml,
 	},
 	props: {
-		episode: {
+		description: {
-			type: Object,
+			type: String,
+			default: '',
+		},
+		image: {
+			type: String,
+			required: true,
+		},
+		link: {
+			type: String,
+			default: null,
+		},
+		name: {
+			type: String,
+			required: true,
+		},
+		size: {
+			type: Number,
+			default: null,
+		},
+		title: {
+			type: String,
+			required: true,
+		},
+		url: {
+			type: String,
 			required: true,
 		},
 	},

src/components/Discover/AddRss.vue

@@ -2,7 +2,7 @@
 	<NcAppNavigationList>
 		<NcAppNavigationNewItem
 			:name="t('repod', 'Add a RSS link')"
-			@new-item="(url) => $router.push(toFeedUrl(url))">
+			@new-item="addSubscription">
 			<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 { toFeedUrl } from '../../utils/url.js'
+import { encodeUrl } from '../../utils/url.js'
 
 export default {
 	name: 'AddRss',
@@ -23,7 +23,9 @@ export default {
 		PlusIcon,
 	},
 	methods: {
-		toFeedUrl,
+		addSubscription(feedUrl) {
+			this.$router.push(encodeUrl(feedUrl))
+		},
 	},
 }
 </script>

src/components/Discover/Search.vue

@@ -7,7 +7,7 @@
 				:key="feed.link"
 				:details="formatLocaleDate(new Date(feed.fetchedAtUnix * 1000))"
 				:name="feed.title"
-				:to="toFeedUrl(feed.link)">
+				:to="toUrl(feed.link)">
 				<template #icon>
 					<NcAvatar
 						:display-name="feed.author"
@@ -19,7 +19,7 @@
 				</template>
 				<template #actions>
 					<NcActionButton
-						v-if="!getSubscriptions.includes(feed.link)"
+						v-if="!subscriptions.includes(feed.link)"
 						:aria-label="t('repod', 'Subscribe')"
 						:name="t('repod', 'Subscribe')"
 						:title="t('repod', 'Subscribe')"
@@ -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 { toFeedUrl } from '../../utils/url.js'
+import { toUrl } from '../../utils/url.js'
 import { useSubscriptions } from '../../store/subscriptions.js'
 
 export default {
@@ -62,12 +62,14 @@ export default {
 			required: true,
 		},
 	},
-	data: () => ({
+	data() {
+		return {
 			feeds: [],
 			loading: false,
-	}),
+		}
+	},
 	computed: {
-		...mapState(useSubscriptions, ['getSubscriptions']),
+		...mapState(useSubscriptions, ['subscriptions']),
 	},
 	watch: {
 		value() {
@@ -77,7 +79,7 @@ export default {
 	methods: {
 		...mapActions(useSubscriptions, ['fetch']),
 		formatLocaleDate,
-		toFeedUrl,
+		toUrl,
 		async addSubscription(url) {
 			try {
 				await axios.post(

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="toFeedUrl(top.link)">
+				<router-link :to="toUrl(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 { toFeedUrl } from '../../utils/url.js'
+import { toUrl } from '../../utils/url.js'
 
 export default {
 	name: 'Toplist',
@@ -30,10 +30,12 @@ export default {
 			required: true,
 		},
 	},
-	data: () => ({
+	data() {
+		return {
 			loading: true,
 			tops: [],
-	}),
+		}
+	},
 	computed: {
 		title() {
 			switch (this.type) {
@@ -61,7 +63,7 @@ export default {
 		}
 	},
 	methods: {
-		toFeedUrl,
+		toUrl,
 	},
 }
 </script>

src/components/Feed/Banner.vue

@@ -23,7 +23,7 @@
 					<SafeHtml :source="description" />
 				</div>
 				<NcAppNavigationNew
-					v-if="!getSubscriptions.includes(url)"
+					v-if="!subscriptions.includes(url)"
 					:text="t('repod', 'Subscribe')"
 					@click="addSubscription">
 					<template #icon>
@@ -79,7 +79,7 @@ export default {
 		},
 	},
 	computed: {
-		...mapState(useSubscriptions, ['getSubscriptions']),
+		...mapState(useSubscriptions, ['subscriptions']),
 		url() {
 			return decodeUrl(this.$route.params.url)
 		},

src/components/Feed/Episode.vue

@@ -1,203 +0,0 @@
-<template>
-	<NcListItem
-		:active="isCurrentEpisode(episode)"
-		:details="!oneLine ? formatLocaleDate(new Date(episode.pubDate?.date)) : ''"
-		:force-display-actions="true"
-		:name="episode.name"
-		:one-line="oneLine"
-		:style="{ opacity: hasEnded(episode) ? 0.4 : 1 }"
-		:title="episode.description"
-		@click="modalEpisode = episode">
-		<template #actions>
-			<NcActionButton
-				v-if="!isCurrentEpisode(episode)"
-				:aria-label="t('repod', 'Play')"
-				:title="t('repod', 'Play')"
-				@click="load(episode, url)">
-				<template #icon>
-					<PlayIcon :size="20" />
-				</template>
-			</NcActionButton>
-			<NcActionButton
-				v-if="isCurrentEpisode(episode)"
-				:aria-label="t('repod', 'Stop')"
-				:title="t('repod', 'Stop')"
-				@click="load(null)">
-				<template #icon>
-					<StopIcon :size="20" />
-				</template>
-			</NcActionButton>
-		</template>
-		<template #extra>
-			<NcActions>
-				<NcActionButton
-					v-if="episode.duration"
-					:aria-label="t('repod', 'Read')"
-					:disabled="loading"
-					:model-value="hasEnded(episode)"
-					:name="t('repod', 'Read')"
-					:title="t('repod', 'Read')"
-					@click="markAs(episode, !hasEnded(episode))">
-					<template #icon>
-						<PlaylistPlayIcon v-if="!hasEnded(episode)" :size="20" />
-						<PlaylistRemoveIcon v-if="hasEnded(episode)" :size="20" />
-					</template>
-				</NcActionButton>
-				<NcActionLink
-					v-if="episode.link"
-					:href="episode.link"
-					:name="t('repod', 'Open website')"
-					target="_blank"
-					:title="t('repod', 'Open website')">
-					<template #icon>
-						<OpenInNewIcon :size="20" />
-					</template>
-				</NcActionLink>
-				<NcActionLink
-					v-if="episode.url"
-					:download="filenameFromUrl(episode.url)"
-					:href="episode.url"
-					:name="t('repod', 'Download')"
-					target="_blank"
-					:title="t('repod', 'Download')">
-					<template #icon>
-						<DownloadIcon :size="20" />
-					</template>
-				</NcActionLink>
-			</NcActions>
-			<NcModal v-if="modalEpisode" @close="modalEpisode = null">
-				<Modal :episode="episode" />
-			</NcModal>
-		</template>
-		<template #icon>
-			<NcAvatar
-				:display-name="episode.name"
-				:is-no-user="true"
-				:url="episode.image" />
-		</template>
-		<template #indicator>
-			<NcProgressBar
-				v-if="isListening(episode) && !oneLine"
-				class="progress"
-				:value="(episode.action.position * 100) / episode.action.total" />
-		</template>
-		<template v-if="!oneLine" #subname>
-			{{ episode.duration }}
-		</template>
-	</NcListItem>
-</template>
-
-<script>
-import {
-	NcActionButton,
-	NcActionLink,
-	NcActions,
-	NcAvatar,
-	NcListItem,
-	NcModal,
-	NcProgressBar,
-} from '@nextcloud/vue'
-import {
-	durationToSeconds,
-	formatEpisodeTimestamp,
-	formatLocaleDate,
-} from '../../utils/time.js'
-import { hasEnded, isListening } from '../../utils/status.js'
-import { mapActions, mapState } from 'pinia'
-import DownloadIcon from 'vue-material-design-icons/Download.vue'
-import Modal from '../Atoms/Modal.vue'
-import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'
-import PlayIcon from 'vue-material-design-icons/Play.vue'
-import PlaylistPlayIcon from 'vue-material-design-icons/PlaylistPlay.vue'
-import PlaylistRemoveIcon from 'vue-material-design-icons/PlaylistRemove.vue'
-import StopIcon from 'vue-material-design-icons/Stop.vue'
-import axios from '@nextcloud/axios'
-import { filenameFromUrl } from '../../utils/url.js'
-import { generateUrl } from '@nextcloud/router'
-import { showError } from '../../utils/toast.js'
-import { usePlayer } from '../../store/player.js'
-
-export default {
-	name: 'Episode',
-	components: {
-		DownloadIcon,
-		Modal,
-		NcActionButton,
-		NcActionLink,
-		NcActions,
-		NcAvatar,
-		NcListItem,
-		NcModal,
-		NcProgressBar,
-		OpenInNewIcon,
-		PlayIcon,
-		PlaylistPlayIcon,
-		PlaylistRemoveIcon,
-		StopIcon,
-	},
-	props: {
-		episode: {
-			type: Object,
-			required: true,
-		},
-		oneLine: {
-			type: Boolean,
-			default: false,
-		},
-		url: {
-			type: String,
-			required: true,
-		},
-	},
-	data: () => ({
-		loading: false,
-		modalEpisode: null,
-	}),
-	computed: {
-		...mapState(usePlayer, { playerEpisode: 'episode' }),
-	},
-	methods: {
-		...mapActions(usePlayer, ['load']),
-		formatLocaleDate,
-		hasEnded,
-		isListening,
-		filenameFromUrl,
-		isCurrentEpisode(episode) {
-			return this.playerEpisode?.url === episode.url
-		},
-		async markAs(episode, read) {
-			try {
-				this.loading = true
-				episode.action = {
-					podcast: this.url,
-					episode: episode.url,
-					guid: episode.guid,
-					action: 'play',
-					timestamp: formatEpisodeTimestamp(new Date()),
-					started: episode.action?.started || 0,
-					position: read ? durationToSeconds(episode.duration) : 0,
-					total: durationToSeconds(episode.duration),
-				}
-				await axios.post(
-					generateUrl('/apps/gpoddersync/episode_action/create'),
-					[episode.action],
-				)
-				if (read && this.isCurrentEpisode(episode)) {
-					this.load(null)
-				}
-			} catch (e) {
-				console.error(e)
-				showError(t('repod', 'Could not change the status of the episode'))
-			} finally {
-				this.loading = false
-			}
-		},
-	},
-}
-</script>
-
-<style scoped>
-.progress {
-	margin-top: 0.4rem;
-}
-</style>

src/components/Feed/Episodes.vue

@@ -2,23 +2,144 @@
 	<div>
 		<Loading v-if="loading" />
 		<ul v-if="!loading">
-			<Episode
+			<NcListItem
 				v-for="episode in filteredEpisodes"
 				:key="episode.guid"
-				:episode="episode"
+				:active="isCurrentEpisode(episode)"
-				:url="url" />
+				: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"
+				:title="episode.description"
+				@click="modalEpisode = episode">
+				<template #actions>
+					<NcActionButton
+						v-if="!isCurrentEpisode(episode)"
+						:aria-label="t('repod', 'Play')"
+						:title="t('repod', 'Play')"
+						@click="load(episode, url)">
+						<template #icon>
+							<PlayIcon :size="20" />
+						</template>
+					</NcActionButton>
+					<NcActionButton
+						v-if="isCurrentEpisode(episode)"
+						:aria-label="t('repod', 'Stop')"
+						:title="t('repod', 'Stop')"
+						@click="load(null)">
+						<template #icon>
+							<StopIcon :size="20" />
+						</template>
+					</NcActionButton>
+				</template>
+				<template #extra>
+					<NcActions>
+						<NcActionButton
+							v-if="episode.duration && !hasEnded(episode)"
+							:aria-label="t('repod', 'Mark as read')"
+							:disabled="loadingAction"
+							:name="t('repod', 'Mark as read')"
+							:title="t('repod', 'Mark as read')"
+							@click="markAs(episode, true)">
+							<template #icon>
+								<PlaylistPlayIcon :size="20" />
+							</template>
+						</NcActionButton>
+						<NcActionButton
+							v-if="episode.duration && hasEnded(episode)"
+							:aria-label="t('repod', 'Mark as unread')"
+							:disabled="loadingAction"
+							:name="t('repod', 'Mark as unread')"
+							:title="t('repod', 'Mark as unread')"
+							@click="markAs(episode, false)">
+							<template #icon>
+								<PlaylistRemoveIcon :size="20" />
+							</template>
+						</NcActionButton>
+						<NcActionLink
+							v-if="episode.link"
+							:href="episode.link"
+							:name="t('repod', 'Open website')"
+							target="_blank"
+							:title="t('repod', 'Open website')">
+							<template #icon>
+								<OpenInNewIcon :size="20" />
+							</template>
+						</NcActionLink>
+						<NcActionLink
+							v-if="episode.url"
+							:download="filenameFromUrl(episode.url)"
+							:href="episode.url"
+							:name="t('repod', 'Download')"
+							target="_blank"
+							:title="t('repod', 'Download')">
+							<template #icon>
+								<DownloadIcon :size="20" />
+							</template>
+						</NcActionLink>
+					</NcActions>
+				</template>
+				<template #icon>
+					<NcAvatar
+						:display-name="episode.name"
+						:is-no-user="true"
+						:url="episode.image" />
+				</template>
+				<template #indicator>
+					<NcProgressBar
+						v-if="isListening(episode)"
+						class="progress"
+						:value="
+							(episode.action.position * 100) / episode.action.total
+						" />
+				</template>
+				<template #subname>
+					{{ episode.duration }}
+				</template>
+			</NcListItem>
 		</ul>
+		<NcModal v-if="modalEpisode" @close="modalEpisode = null">
+			<Modal
+				:description="modalEpisode.description"
+				:image="modalEpisode.image"
+				:link="modalEpisode.link"
+				:name="modalEpisode.name"
+				:size="modalEpisode.size"
+				:title="modalEpisode.title"
+				:url="modalEpisode.url" />
+		</NcModal>
 	</div>
 </template>
 
 <script>
-import { hasEnded, isListening } from '../../utils/status.js'
+import {
-import Episode from './Episode.vue'
+	NcActionButton,
+	NcActionLink,
+	NcActions,
+	NcAvatar,
+	NcListItem,
+	NcModal,
+	NcProgressBar,
+} from '@nextcloud/vue'
+import { decodeUrl, filenameFromUrl } from '../../utils/url.js'
+import {
+	durationToSeconds,
+	formatEpisodeTimestamp,
+	formatLocaleDate,
+} from '../../utils/time.js'
+import { mapActions, mapState } from 'pinia'
+import DownloadIcon from 'vue-material-design-icons/Download.vue'
 import Loading from '../Atoms/Loading.vue'
+import Modal from '../Atoms/Modal.vue'
+import OpenInNewIcon from 'vue-material-design-icons/OpenInNew.vue'
+import PlayIcon from 'vue-material-design-icons/Play.vue'
+import PlaylistPlayIcon from 'vue-material-design-icons/PlaylistPlay.vue'
+import PlaylistRemoveIcon from 'vue-material-design-icons/PlaylistRemove.vue'
+import StopIcon from 'vue-material-design-icons/Stop.vue'
 import axios from '@nextcloud/axios'
-import { decodeUrl } from '../../utils/url.js'
 import { generateUrl } from '@nextcloud/router'
-import { mapState } from 'pinia'
 import { showError } from '../../utils/toast.js'
 import { usePlayer } from '../../store/player.js'
 import { useSettings } from '../../store/settings.js'
@@ -26,13 +147,30 @@ import { useSettings } from '../../store/settings.js'
 export default {
 	name: 'Episodes',
 	components: {
-		Episode,
+		DownloadIcon,
 		Loading,
+		Modal,
+		NcActionButton,
+		NcActionLink,
+		NcActions,
+		NcAvatar,
+		NcListItem,
+		NcModal,
+		NcProgressBar,
+		OpenInNewIcon,
+		PlayIcon,
+		PlaylistPlayIcon,
+		PlaylistRemoveIcon,
+		StopIcon,
 	},
-	data: () => ({
+	data() {
+		return {
 			episodes: [],
 			loading: true,
-	}),
+			loadingAction: false,
+			modalEpisode: null,
+		}
+	},
 	computed: {
 		...mapState(usePlayer, ['episode']),
 		...mapState(useSettings, ['filters']),
@@ -85,8 +223,63 @@ export default {
 		}
 	},
 	methods: {
-		hasEnded,
+		...mapActions(usePlayer, ['load']),
-		isListening,
+		filenameFromUrl,
+		formatLocaleDate,
+		hasEnded(episode) {
+			return (
+				episode.action &&
+				(episode.action.action === 'DELETE' ||
+					(episode.action.position > 0 &&
+						episode.action.total > 0 &&
+						episode.action.position >= episode.action.total))
+			)
+		},
+		isCurrentEpisode(episode) {
+			return this.episode && this.episode.url === episode.url
+		},
+		isListening(episode) {
+			return (
+				episode.action &&
+				episode.action.action &&
+				episode.action.action.toLowerCase() === 'play' &&
+				episode.action.position > 0 &&
+				!this.hasEnded(episode)
+			)
+		},
+		async markAs(episode, read) {
+			try {
+				this.loadingAction = true
+				episode.action = {
+					podcast: this.url,
+					episode: episode.url,
+					guid: episode.guid,
+					action: 'play',
+					timestamp: formatEpisodeTimestamp(new Date()),
+					started: episode.action ? episode.action.started : 0,
+					position: read ? durationToSeconds(episode.duration) : 0,
+					total: durationToSeconds(episode.duration),
+				}
+				await axios.post(
+					generateUrl('/apps/gpoddersync/episode_action/create'),
+					[episode.action],
+				)
+				if (read && this.episode && episode.url === this.episode.url) {
+					this.load(null)
+				}
+			} catch (e) {
+				console.error(e)
+				showError(t('repod', 'Could not change the status of the episode'))
+			} finally {
+				this.loadingAction = false
+			}
+		},
 	},
 }
 </script>
+
+<style scoped>
+.progress {
+	margin-top: 0.4rem;
+}
+</style>

src/components/Feed/Favorites.vue

@@ -1,108 +0,0 @@
-<template>
-	<NcGuestContent class="guest">
-		<Loading v-if="!currentFavoriteData" />
-		<NcAvatar
-			v-if="currentFavoriteData"
-			class="avatar"
-			:display-name="currentFavoriteData.author || currentFavoriteData.title"
-			:is-no-user="true"
-			:size="222"
-			:url="currentFavoriteData.imageUrl" />
-		<div class="list">
-			<h2 class="title">{{ currentFavoriteData.title }}</h2>
-			<Loading v-if="loading" />
-			<ul v-if="!loading">
-				<Episode
-					v-for="episode in episodes"
-					:key="episode.guid"
-					:episode="episode"
-					:one-line="true"
-					:url="url" />
-			</ul>
-		</div>
-	</NcGuestContent>
-</template>
-
-<script>
-import { NcAvatar, NcGuestContent } from '@nextcloud/vue'
-import Episode from './Episode.vue'
-import Loading from '../Atoms/Loading.vue'
-import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
-import { hasEnded } from '../../utils/status.js'
-import { mapState } from 'pinia'
-import { showError } from '../../utils/toast.js'
-import { useSubscriptions } from '../../store/subscriptions.js'
-
-export default {
-	name: 'Favorites',
-	components: {
-		Episode,
-		Loading,
-		NcAvatar,
-		NcGuestContent,
-	},
-	props: {
-		url: {
-			type: String,
-			required: true,
-		},
-	},
-	data: () => ({
-		episodes: [],
-		loading: true,
-	}),
-	computed: {
-		...mapState(useSubscriptions, ['getFavorites']),
-		currentFavoriteData() {
-			return this.getFavorites.find((fav) => fav.url === this.url)
-		},
-	},
-	async mounted() {
-		try {
-			this.loading = true
-			const episodes = await axios.get(
-				generateUrl('/apps/repod/episodes/list?url={url}', {
-					url: this.url,
-				}),
-			)
-			this.episodes = [...episodes.data]
-				.sort(
-					(a, b) => new Date(b.pubDate?.date) - new Date(a.pubDate?.date),
-				)
-				.filter((episode) => !this.hasEnded(episode))
-				.slice(0, 4)
-		} catch (e) {
-			console.error(e)
-			showError(t('repod', 'Could not fetch episodes'))
-		} finally {
-			this.loading = false
-		}
-	},
-	methods: {
-		hasEnded,
-	},
-}
-</script>
-
-<style scoped>
-.guest {
-	display: flex;
-	flex-wrap: wrap;
-	gap: 1rem;
-}
-
-.list {
-	flex: 1;
-}
-
-.title {
-	text-align: center;
-}
-
-@media only screen and (max-width: 768px) {
-	.avatar {
-		display: none;
-	}
-}
-</style>

src/components/Player/Bar.vue

@@ -78,7 +78,7 @@ export default {
 
 @media only screen and (max-width: 768px) {
 	.infos {
-		flex: 1;
+		flex: 2;
 	}
 
 	.timer,

src/components/Player/Infos.vue

@@ -3,11 +3,18 @@
 		<strong class="pointer" @click="modal = true">
 			{{ episode.name }}
 		</strong>
-		<router-link :to="toFeedUrl(podcastUrl)">
+		<router-link :to="hash">
 			<i>{{ episode.title }}</i>
 		</router-link>
 		<NcModal v-if="modal" @close="modal = false">
-			<Modal :episode="episode" />
+			<Modal
+				:description="episode.description"
+				:image="episode.image"
+				:link="episode.link"
+				:name="episode.name"
+				:size="episode.size"
+				:title="episode.title"
+				:url="episode.url" />
 		</NcModal>
 	</div>
 </template>
@@ -16,7 +23,7 @@
 import Modal from '../Atoms/Modal.vue'
 import { NcModal } from '@nextcloud/vue'
 import { mapState } from 'pinia'
-import { toFeedUrl } from '../../utils/url.js'
+import { toUrl } from '../../utils/url.js'
 import { usePlayer } from '../../store/player.js'
 
 export default {
@@ -25,14 +32,16 @@ export default {
 		Modal,
 		NcModal,
 	},
-	data: () => ({
+	data() {
+		return {
 			modal: false,
-	}),
+		}
+	},
 	computed: {
 		...mapState(usePlayer, ['episode', 'podcastUrl']),
+		hash() {
+			return toUrl(this.podcastUrl)
 		},
-	methods: {
-		toFeedUrl,
 	},
 }
 </script>

src/components/Player/Volume.vue

@@ -46,9 +46,11 @@ export default {
 		VolumeMediumIcon,
 		VolumeMuteIcon,
 	},
-	data: () => ({
+	data() {
+		return {
 			volumeMuted: 0,
-	}),
+		}
+	},
 	computed: {
 		...mapState(usePlayer, ['volume']),
 	},

src/components/Settings/Filters.vue

@@ -44,6 +44,7 @@ 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 { getCookie } from '../../utils/cookies.js'
 import { useSettings } from '../../store/settings.js'
 
 export default {
@@ -64,6 +65,12 @@ export default {
 			)
 		},
 	},
+	mounted() {
+		try {
+			const filters = getCookie('repod.filters')
+			this.filters = JSON.parse(filters)
+		} catch {}
+	},
 	methods: {
 		...mapActions(useSettings, ['setFilters']),
 	},

src/components/Settings/Import.vue

@@ -44,10 +44,12 @@ export default {
 		NcAppNavigationItem,
 		NcModal,
 	},
-	data: () => ({
+	data() {
+		return {
 			loading: false,
 			modal: false,
-	}),
+		}
+	},
 	methods: {
 		generateUrl,
 		async importOpml(event) {

src/components/Sidebar/Item.vue

@@ -2,19 +2,8 @@
 	<NcAppNavigationItem
 		:loading="loading"
 		:name="feed ? feed.title : url"
-		:to="toFeedUrl(url)">
+		:to="hash">
 		<template #actions>
-			<NcActionButton
-				:aria-label="t('repod', 'Favorite')"
-				:model-value="isFavorite"
-				:name="t('repod', 'Favorite')"
-				:title="t('repod', 'Favorite')"
-				@update:modelValue="switchFavorite($event)">
-				<template #icon>
-					<StarPlusIcon v-if="!isFavorite" :size="20" />
-					<StarRemoveIcon v-if="isFavorite" :size="20" />
-				</template>
-			</NcActionButton>
 			<NcActionButton
 				:aria-label="t(`core`, 'Delete')"
 				:name="t(`core`, 'Delete')"
@@ -31,7 +20,6 @@
 				:display-name="feed.author || feed.title"
 				:is-no-user="true"
 				:url="feed.imageUrl" />
-			<StarIcon v-if="feed && isFavorite" class="star" :size="20" />
 			<AlertIcon v-if="failed" />
 		</template>
 	</NcAppNavigationItem>
@@ -39,29 +27,23 @@
 
 <script>
 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 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 { mapActions } from 'pinia'
 import { showError } from '../../utils/toast.js'
-import { toFeedUrl } from '../../utils/url.js'
+import { toUrl } from '../../utils/url.js'
 import { useSubscriptions } from '../../store/subscriptions.js'
 
 export default {
-	name: 'Subscription',
+	name: 'Item',
 	components: {
 		AlertIcon,
 		DeleteIcon,
 		NcActionButton,
 		NcAppNavigationItem,
 		NcAvatar,
-		StarIcon,
-		StarPlusIcon,
-		StarRemoveIcon,
 	},
 	props: {
 		url: {
@@ -69,15 +51,16 @@ export default {
 			required: true,
 		},
 	},
-	data: () => ({
+	data() {
+		return {
 			failed: false,
 			loading: true,
 			feed: null,
-	}),
+		}
+	},
 	computed: {
-		...mapState(useSubscriptions, ['getFavorites']),
+		hash() {
-		isFavorite() {
+			return toUrl(this.url)
-			return this.getFavorites.map((fav) => fav.url).includes(this.url)
 		},
 	},
 	async mounted() {
@@ -91,7 +74,6 @@ export default {
 				),
 			)
 			this.feed = podcastData.data.data
-			this.editFavoriteData(this.url, podcastData.data.data)
 		} catch (e) {
 			this.failed = true
 			console.error(e)
@@ -100,13 +82,7 @@ export default {
 		}
 	},
 	methods: {
-		...mapActions(useSubscriptions, [
+		...mapActions(useSubscriptions, ['fetch']),
-			'fetch',
-			'addFavorite',
-			'editFavoriteData',
-			'removeFavorite',
-		]),
-		toFeedUrl,
 		async deleteSubscription() {
 			if (
 				confirm(
@@ -123,33 +99,11 @@ export default {
 					console.error(e)
 					showError(t('repod', 'Error while removing the feed'))
 				} finally {
-					this.removeFavorite(this.url)
 					this.loading = false
 					this.fetch()
 				}
 			}
 		},
-		switchFavorite(value) {
-			if (value) {
-				if (this.getFavorites.length >= 10) {
-					showError(t('repod', 'You can only have 10 favorites'))
-					return
-				}
-
-				this.addFavorite(this.url)
-			} else {
-				this.removeFavorite(this.url)
-			}
-		},
 	},
 }
 </script>
-
-<style scoped>
-.star {
-	bottom: 2px;
-	color: yellow;
-	left: 22px;
-	position: absolute;
-}
-</style>

src/components/Sidebar/Subscriptions.vue

@@ -2,7 +2,7 @@
 	<AppNavigation>
 		<template #list>
 			<NcAppContentList>
-				<router-link to="/discover">
+				<router-link to="/">
 					<NcAppNavigationNew :text="t('repod', 'Add a podcast')">
 						<template #icon>
 							<PlusIcon :size="20" />
@@ -11,17 +11,10 @@
 				</router-link>
 				<Loading v-if="loading" />
 				<NcAppNavigationList v-if="!loading">
-					<Subscription
+					<Item
-						v-for="url of getFavorites.map((fav) => fav.url)"
+						v-for="subscriptionUrl of subscriptions"
-						:key="url"
+						:key="subscriptionUrl"
-						:url="url" />
+						:url="subscriptionUrl" />
-					<Subscription
-						v-for="url of getSubscriptions.filter(
-							(sub) =>
-								!getFavorites.map((fav) => fav.url).includes(sub),
-						)"
-						:key="url"
-						:url="url" />
 				</NcAppNavigationList>
 			</NcAppContentList>
 		</template>
@@ -39,10 +32,10 @@ import {
 } from '@nextcloud/vue'
 import { mapActions, mapState } from 'pinia'
 import AppNavigation from '../Atoms/AppNavigation.vue'
+import Item from './Item.vue'
 import Loading from '../Atoms/Loading.vue'
 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.js'
 import { useSubscriptions } from '../../store/subscriptions.js'
 
@@ -50,19 +43,21 @@ export default {
 	name: 'Subscriptions',
 	components: {
 		AppNavigation,
+		Item,
 		Loading,
 		NcAppContentList,
 		NcAppNavigationList,
 		NcAppNavigationNew,
 		PlusIcon,
 		Settings,
-		Subscription,
 	},
-	data: () => ({
+	data() {
+		return {
 			loading: true,
-	}),
+		}
+	},
 	computed: {
-		...mapState(useSubscriptions, ['getSubscriptions', 'getFavorites']),
+		...mapState(useSubscriptions, ['subscriptions']),
 	},
 	async mounted() {
 		try {

src/router.js

@@ -1,22 +1,17 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHashHistory } 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: createWebHistory(generateUrl('apps/repod')),
+	history: createWebHashHistory(generateUrl('apps/repod')),
 	routes: [
 		{
 			path: '/',
-			component: Home,
-		},
-		{
-			path: '/discover',
 			component: Discover,
 		},
 		{
-			path: '/feed/:url',
+			path: '/:url',
 			component: Feed,
 		},
 	],

src/store/player.js

@@ -44,11 +44,12 @@ export const usePlayer = defineStore('player', {
 						}),
 					)
 
-					this.episode.action = action.data
+					this.episode.action = action
 				} catch {}
 
 				if (
 					this.episode.action &&
+					this.episode.action.position &&
 					this.episode.action.position < this.episode.action.total
 				) {
 					audio.currentTime = this.episode.action.position

src/store/settings.js

@@ -1,27 +1,14 @@
-import { getCookie, setCookie } from '../utils/cookies.js'
 import { defineStore } from 'pinia'
+import { setCookie } from '../utils/cookies.js'
 
 export const useSettings = defineStore('settings', {
-	state: () => {
+	state: () => ({
-		try {
-			const filters = JSON.parse(getCookie('repod.filters'))
-			return {
-				filters: {
-					listened: filters.listened,
-					listening: filters.listening,
-					unlistened: filters.unlistened,
-				},
-			}
-		} catch {
-			return {
 		filters: {
 			listened: true,
 			listening: true,
 			unlistened: true,
 		},
-			}
+	}),
-		}
-	},
 	actions: {
 		setFilters(filters) {
 			this.filters = { ...this.filters, ...filters }

src/store/subscriptions.js

@@ -1,23 +1,11 @@
-import { getCookie, setCookie } from '../utils/cookies.js'
 import axios from '@nextcloud/axios'
 import { defineStore } from 'pinia'
 import { generateUrl } from '@nextcloud/router'
 
 export const useSubscriptions = defineStore('subscriptions', {
 	state: () => ({
-		subs: [],
+		subscriptions: [],
-		favs: [],
 	}),
-	getters: {
-		getSubscriptions: (state) => {
-			return state.subs
-		},
-		getFavorites: (state) => {
-			return state.favs
-				.filter((fav) => state.subs.includes(fav.url))
-				.sort((fav) => fav.lastPub)
-		},
-	},
 	actions: {
 		async fetch() {
 			const metrics = await axios.get(
@@ -26,33 +14,7 @@ export const useSubscriptions = defineStore('subscriptions', {
 			const subs = [...metrics.data.subscriptions].sort(
 				(a, b) => b.listenedSeconds - a.listenedSeconds,
 			)
-			this.subs = subs.map((sub) => sub.url)
+			this.subscriptions = subs.map((sub) => sub.url)
-
-			try {
-				const favs = JSON.parse(getCookie('repod.favorites')) || []
-				this.favs = favs.map((url) => ({ url }))
-			} catch {}
-		},
-		addFavorite(url) {
-			this.favs.push({ url })
-			setCookie(
-				'repod.favorites',
-				JSON.stringify(this.favs.map((fav) => fav.url)),
-				365,
-			)
-		},
-		editFavoriteData(url, data) {
-			this.favs = this.favs.map((fav) =>
-				fav.url === url ? { ...fav, ...data } : fav,
-			)
-		},
-		removeFavorite(url) {
-			this.favs = this.favs.filter((fav) => fav.url !== url)
-			setCookie(
-				'repod.favorites',
-				JSON.stringify(this.favs.map((fav) => fav.url)),
-				365,
-			)
 		},
 	},
 })

src/utils/status.js

@@ -1,14 +0,0 @@
-export const hasEnded = (episode) =>
-	episode.action &&
-	episode.action.action &&
-	(episode.action.action.toLowerCase() === 'delete' ||
-		(episode.action.position > 0 &&
-			episode.action.total > 0 &&
-			episode.action.position >= episode.action.total))
-
-export const isListening = (episode) =>
-	episode.action &&
-	episode.action.action &&
-	episode.action.action.toLowerCase() === 'play' &&
-	episode.action.position > 0 &&
-	!hasEnded(episode)

src/utils/url.js

@@ -1,6 +1,6 @@
 export const encodeUrl = (url) => encodeURIComponent(btoa(url))
 export const decodeUrl = (url) => atob(decodeURIComponent(url))
-export const toFeedUrl = (url) => `/feed/${encodeUrl(url)}`
+export const toUrl = (url) => `/${encodeUrl(url)}`
 export const filenameFromUrl = (str) => {
 	const url = new URL(str)
 	return url.pathname.split('/').pop()

src/views/Discover.vue

@@ -1,5 +1,5 @@
 <template>
-	<AppContent class="padding">
+	<AppContent class="main">
 		<NcTextField v-model="search" :label="t('repod', 'Find a podcast')">
 			<template #icon>
 				<Magnify :size="20" />
@@ -30,14 +30,16 @@ export default {
 		Search,
 		Toplist,
 	},
-	data: () => ({
+	data() {
+		return {
 			search: '',
-	}),
+		}
+	},
 }
 </script>
 
 <style scoped>
-.padding {
+.main {
 	padding: 15px 51px;
 }
 </style>

src/views/Feed.vue

@@ -1,14 +1,14 @@
 <template>
 	<AppContent>
 		<Loading v-if="loading" />
-		<EmptyContent
+		<NcEmptyContent
 			v-if="failed"
 			class="error"
 			:name="t('repod', 'Error loading feed')">
 			<template #icon>
 				<Alert />
 			</template>
-		</EmptyContent>
+		</NcEmptyContent>
 		<Banner
 			v-if="feed"
 			:author="feed.author"
@@ -24,9 +24,9 @@
 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 { NcEmptyContent } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import { decodeUrl } from '../utils/url.js'
 import { generateUrl } from '@nextcloud/router'
@@ -37,15 +37,17 @@ export default {
 		Alert,
 		AppContent,
 		Banner,
-		EmptyContent,
 		Episodes,
 		Loading,
+		NcEmptyContent,
 	},
-	data: () => ({
+	data() {
+		return {
 			failed: false,
 			loading: true,
 			feed: null,
-	}),
+		}
+	},
 	computed: {
 		url() {
 			return decodeUrl(this.$route.params.url)

src/views/GPodder.vue

@@ -1,6 +1,6 @@
 <template>
-	<AppContent>
+	<NcAppContent class="content">
-		<EmptyContent class="empty" :name="t('repod', 'Missing required app')">
+		<NcEmptyContent :name="t('repod', 'Missing required app')">
 			<template #action>
 				<NcButton :href="gPodderSyncUrl">
 					{{ t('repod', 'Install GPodder Sync') }}
@@ -9,24 +9,22 @@
 			<template #icon>
 				<Alert />
 			</template>
-		</EmptyContent>
+		</NcEmptyContent>
-	</AppContent>
+	</NcAppContent>
 </template>
 
 <script>
+import { NcAppContent, NcButton, NcEmptyContent } from '@nextcloud/vue'
 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'
 
 export default {
 	name: 'GPodder',
 	components: {
 		Alert,
-		AppContent,
+		NcAppContent,
-		EmptyContent,
 		NcButton,
+		NcEmptyContent,
 	},
 	computed: {
 		gPodderSyncUrl() {

src/views/Home.vue

@@ -1,42 +0,0 @@
-<template>
-	<AppContent>
-		<EmptyContent
-			v-if="!getFavorites.length"
-			class="empty"
-			:description="
-				t('repod', 'Pin some subscriptions to see their latest updates')
-			"
-			:name="t('repod', 'No favorites')">
-			<template #icon>
-				<StarOffIcon :size="20" />
-			</template>
-		</EmptyContent>
-		<ul v-if="getFavorites.length">
-			<li v-for="url in getFavorites.map((fav) => fav.url)" :key="url">
-				<Favorites :url="url" />
-			</li>
-		</ul>
-	</AppContent>
-</template>
-
-<script>
-import AppContent from '../components/Atoms/AppContent.vue'
-import EmptyContent from '../components/Atoms/EmptyContent.vue'
-import Favorites from '../components/Feed/Favorites.vue'
-import StarOffIcon from 'vue-material-design-icons/StarOff.vue'
-import { mapState } from 'pinia'
-import { useSubscriptions } from '../store/subscriptions.js'
-
-export default {
-	name: 'Home',
-	components: {
-		AppContent,
-		EmptyContent,
-		Favorites,
-		StarOffIcon,
-	},
-	computed: {
-		...mapState(useSubscriptions, ['getFavorites']),
-	},
-}
-</script>

translationfiles/de/repod.po

@@ -83,18 +83,21 @@ msgstr "Abspielen"
 msgid "Stop"
 msgstr "Stopp"
 
-msgid "Read"
+msgid "Mark as read"
-msgstr "Gelesen"
+msgstr "Als gelesen markieren"
+
+msgid "Mark as unread"
+msgstr "Als ungelesen markieren"
 
 msgid "Open website"
 msgstr "Webseite aufrufen"
 
-msgid "Could not change the status of the episode"
-msgstr "Kann den Status der Folge nicht ändern"
-
 msgid "Could not fetch episodes"
 msgstr "Folgen können nicht abgerufen werden"
 
+msgid "Could not change the status of the episode"
+msgstr "Kann den Status der Folge nicht ändern"
+
 msgid "Export subscriptions"
 msgstr "Abonnements exportieren"
 
@@ -125,18 +128,12 @@ msgstr "Bewerte RePod ❤️"
 msgid "Playback speed"
 msgstr "Wiedergabegeschwindigkeit"
 
-msgid "Favorite"
-msgstr "Favorit"
-
 msgid "Are you sure you want to delete this subscription?"
 msgstr "Bist Du sicher, dass Du das Abonnement löschen möchtest?"
 
 msgid "Error while removing the feed"
 msgstr "Fehler beim Löschen des Feeds"
 
-msgid "You can only have 10 favorites"
-msgstr "Du kannst nur 10 Favoriten haben"
-
 msgid "Add a podcast"
 msgstr "Einen Podcast hinzufügen"
 
@@ -154,9 +151,3 @@ msgstr "Benötigte App fehlt"
 
 msgid "Install GPodder Sync"
 msgstr "Installiere GPodder Sync"
-
-msgid "Pin some subscriptions to see their latest updates"
-msgstr "Pinne einige Abonnements, um ihre neuesten Updates zu sehen"
-
-msgid "No favorites"
-msgstr "Keine Favoriten"

translationfiles/fr/repod.po

@@ -83,18 +83,21 @@ msgstr "Lecture"
 msgid "Stop"
 msgstr "Arrêter"
 
-msgid "Read"
+msgid "Mark as read"
-msgstr "Lu"
+msgstr "Marquer comme lu"
+
+msgid "Mark as unread"
+msgstr "Marquer comme non lu"
 
 msgid "Open website"
 msgstr "Ouvrir le site web"
 
-msgid "Could not change the status of the episode"
-msgstr "Impossible de changer le status de l'épisode"
-
 msgid "Could not fetch episodes"
 msgstr "Impossible de récuprer les épisodes"
 
+msgid "Could not change the status of the episode"
+msgstr "Impossible de changer le status de l'épisode"
+
 msgid "Export subscriptions"
 msgstr "Exporter les abonnements"
 
@@ -125,18 +128,12 @@ msgstr "Donnez votre avis ❤️"
 msgid "Playback speed"
 msgstr "Vitesse de lecture"
 
-msgid "Favorite"
-msgstr "Favori"
-
 msgid "Are you sure you want to delete this subscription?"
 msgstr "Êtes-vous sûr de vouloir supprimer ce flux ?"
 
 msgid "Error while removing the feed"
 msgstr "Erreur lors de la suppression du flux"
 
-msgid "You can only have 10 favorites"
-msgstr "Vous ne pouvez avoir que 10 favoris"
-
 msgid "Add a podcast"
 msgstr "Ajouter un podcast"
 
@@ -154,9 +151,3 @@ msgstr "Une application requise est manquante"
 
 msgid "Install GPodder Sync"
 msgstr "Installer GPodder Sync"
-
-msgid "Pin some subscriptions to see their latest updates"
-msgstr "Ajoutez des abonnements en favoris pour obtenir les dernières nouvelles ici"
-
-msgid "No favorites"
-msgstr "Aucun favoris"

translationfiles/templates/repod.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Nextcloud 3.14159\n"
 "Report-Msgid-Bugs-To: translations\\@example.com\n"
-"POT-Creation-Date: 2024-09-02 09:08+0000\n"
+"POT-Creation-Date: 2024-08-09 10:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,8 +48,8 @@ msgid ""
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:1
-#: /app/specialVueFakeDummyForL10nScript.js:24
+#: /app/specialVueFakeDummyForL10nScript.js:27
-#: /app/specialVueFakeDummyForL10nScript.js:25
+#: /app/specialVueFakeDummyForL10nScript.js:28
 msgid "Download"
 msgstr ""
 
@@ -106,109 +106,96 @@ msgstr ""
 #: /app/specialVueFakeDummyForL10nScript.js:19
 #: /app/specialVueFakeDummyForL10nScript.js:20
 #: /app/specialVueFakeDummyForL10nScript.js:21
-msgid "Read"
+msgid "Mark as read"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:22
 #: /app/specialVueFakeDummyForL10nScript.js:23
+#: /app/specialVueFakeDummyForL10nScript.js:24
+msgid "Mark as unread"
+msgstr ""
+
+#: /app/specialVueFakeDummyForL10nScript.js:25
+#: /app/specialVueFakeDummyForL10nScript.js:26
 msgid "Open website"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:26
+#: /app/specialVueFakeDummyForL10nScript.js:29
-msgid "Could not change the status of the episode"
-msgstr ""
-
-#: /app/specialVueFakeDummyForL10nScript.js:27
-#: /app/specialVueFakeDummyForL10nScript.js:28
 msgid "Could not fetch episodes"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:29
-msgid "Export subscriptions"
-msgstr ""
-
 #: /app/specialVueFakeDummyForL10nScript.js:30
-msgid "Filtering episodes"
+msgid "Could not change the status of the episode"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:31
-msgid "Show all"
+msgid "Export subscriptions"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:32
-msgid "Listened"
+msgid "Filtering episodes"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:33
-msgid "Listening"
+msgid "Show all"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:34
-msgid "Unlistened"
+msgid "Listened"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:35
-msgid "Import subscriptions"
+msgid "Listening"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:36
-msgid "Import OPML file"
+msgid "Unlistened"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:37
-msgid "Rate RePod ❤️"
+msgid "Import subscriptions"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:38
-msgid "Playback speed"
+msgid "Import OPML file"
 msgstr ""
 
 #: /app/specialVueFakeDummyForL10nScript.js:39
-#: /app/specialVueFakeDummyForL10nScript.js:40
+msgid "Rate RePod ❤️"
-#: /app/specialVueFakeDummyForL10nScript.js:41
-msgid "Favorite"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:42
+#: /app/specialVueFakeDummyForL10nScript.js:40
+msgid "Playback speed"
+msgstr ""
+
+#: /app/specialVueFakeDummyForL10nScript.js:41
 msgid "Are you sure you want to delete this subscription?"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:43
+#: /app/specialVueFakeDummyForL10nScript.js:42
 msgid "Error while removing the feed"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:44
+#: /app/specialVueFakeDummyForL10nScript.js:43
-msgid "You can only have 10 favorites"
-msgstr ""
-
-#: /app/specialVueFakeDummyForL10nScript.js:45
 msgid "Add a podcast"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:46
+#: /app/specialVueFakeDummyForL10nScript.js:44
 msgid "Could not fetch subscriptions"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:47
+#: /app/specialVueFakeDummyForL10nScript.js:45
 msgid "Find a podcast"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:48
+#: /app/specialVueFakeDummyForL10nScript.js:46
 msgid "Error loading feed"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:49
+#: /app/specialVueFakeDummyForL10nScript.js:47
 msgid "Missing required app"
 msgstr ""
 
-#: /app/specialVueFakeDummyForL10nScript.js:50
+#: /app/specialVueFakeDummyForL10nScript.js:48
 msgid "Install GPodder Sync"
 msgstr ""
-
-#: /app/specialVueFakeDummyForL10nScript.js:51
-msgid "Pin some subscriptions to see their latest updates"
-msgstr ""
-
-#: /app/specialVueFakeDummyForL10nScript.js:52
-msgid "No favorites"
-msgstr ""

vite.config.mjs

@@ -1,6 +1,5 @@
 import { createAppConfig } from '@nextcloud/vite-config'
 import { defineConfig } from 'vite'
-import vueDevTools from 'vite-plugin-vue-devtools'
 
 const config = defineConfig(({ mode }) => ({
 	build: {
@@ -11,12 +10,8 @@ const config = defineConfig(({ mode }) => ({
 				manualChunks: false,
 			},
 		},
-		sourcemap: mode !== 'production',
+		sourcemap: mode === 'development',
 	},
-	define: {
-		__VUE_PROD_DEVTOOLS__: mode !== 'production'
-	  },
-	plugins: [vueDevTools()],
 }))
 
 export default createAppConfig(