CHANGELOG.md

+## [1.12.5](https://code.castopod.org/adaures/castopod/compare/v1.12.4...v1.12.5) (2024-07-30)
+
+### Bug Fixes
+
+- **rss:** add subscription id to cache name to prevent premium feeds from
+  overlapping
+  ([5310d86](https://code.castopod.org/adaures/castopod/commit/5310d8648af6d43b9090f8d9f8066f7b3a8f0aa7))
+
 ## [1.12.4](https://code.castopod.org/adaures/castopod/compare/v1.12.3...v1.12.4) (2024-07-30)
 
 ### Bug Fixes

app/Config/Constants.php

@@ -11,7 +11,7 @@ declare(strict_types=1);
  |
  | NOTE: this constant is updated upon release with Continuous Integration.
  */
-defined('CP_VERSION') || define('CP_VERSION', '1.12.4');
+defined('CP_VERSION') || define('CP_VERSION', '1.12.5');
 
 /*
  | --------------------------------------------------------------------

app/Controllers/FeedController.php

@@ -66,7 +66,7 @@ class FeedController extends Controller
                 "podcast#{$podcast->id}",
                 'feed',
                 $service ? $serviceSlug : null,
-                $subscription instanceof Subscription ? 'unlocked' : null,
+                $subscription instanceof Subscription ? "subscription#{$subscription->id}" : null,
             ]),
         );
 

composer.json

 {
   "name": "adaures/castopod",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "type": "project",
   "description": "Castopod is an open-source hosting platform made for podcasters who want engage and interact with their audience.",
   "homepage": "https://castopod.org",
@@ -9,42 +9,42 @@
     "php": "^8.1",
     "adaures/ipcat-php": "^v1.0.0",
     "adaures/podcast-persons-taxonomy": "^v1.0.1",
-    "aws/aws-sdk-php": "^3.315.2",
+    "aws/aws-sdk-php": "^3.316.9",
     "chrisjean/php-ico": "^1.0.4",
     "cocur/slugify": "^v4.5.1",
-    "codeigniter4/framework": "v4.5.3",
+    "codeigniter4/framework": "v4.5.4",
     "codeigniter4/settings": "v2.2.0",
     "codeigniter4/shield": "v1.1.0",
     "codeigniter4/tasks": "dev-develop",
     "geoip2/geoip2": "v3.0.0",
     "james-heinrich/getid3": "^2.0.0-beta6",
-    "league/commonmark": "^2.4.2",
+    "league/commonmark": "^2.5.1",
     "league/html-to-markdown": "5.1.1",
     "melbahja/seo": "^v2.1.1",
     "michalsn/codeigniter4-uuid": "v1.1.0",
     "mpratt/embera": "^2.0.40",
     "opawg/user-agents-v2-php": "dev-main",
     "phpseclib/phpseclib": "~2.0.47",
-    "vlucas/phpdotenv": "v5.6.0",
+    "vlucas/phpdotenv": "v5.6.1",
     "whichbrowser/parser": "^v2.1.8",
     "yassinedoghri/codeigniter-icons": "dev-develop",
     "yassinedoghri/podcast-feed": "dev-main"
   },
   "require-dev": {
-    "captainhook/captainhook": "^5.23.1",
+    "captainhook/captainhook": "^5.23.3",
     "codeigniter/phpstan-codeigniter": "v1.4.3",
     "mikey179/vfsstream": "^v1.6.11",
     "phpstan/extension-installer": "^1.4.1",
-    "phpstan/phpstan": "^1.11.6",
-    "phpunit/phpunit": "^10.5.24",
-    "rector/rector": "^1.2.0",
-    "symplify/coding-standard": "^12.1.6",
-    "symplify/easy-coding-standard": "^12.3.0"
+    "phpstan/phpstan": "^1.11.8",
+    "phpunit/phpunit": "^10.5.29",
+    "rector/rector": "^1.2.2",
+    "symplify/coding-standard": "^12.2.1",
+    "symplify/easy-coding-standard": "^12.3.3"
   },
   "autoload": {
     "psr-4": {
       "App\\": "app/",
-      "Config\\": "app/Config"
+      "Config\\": "app/Config/"
     },
     "exclude-from-classmap": [
       "**/Database/Migrations/**"

modules/Fediverse/Helpers/fediverse_helper.php

@@ -405,7 +405,7 @@ if (! function_exists('linkify')) {
                 ),
                 'handle' => preg_replace_callback(
                     '~(?<!\w)@(?<username>\w++)(?:@(?<domain>(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]))?~',
-                    static function (array $match) use (&$links) {
+                    static function (array $match) use (&$links): string {
                         // check if host is set and look for actor in database
                         if (isset($match['host'])) {
                             if (

package.json

 {
   "name": "castopod",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "description": "Castopod Host is an open-source hosting platform made for podcasters who want engage and interact with their audience.",
   "private": true,
   "license": "AGPL-3.0-or-later",
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@amcharts/amcharts4": "^4.10.39",
-    "@amcharts/amcharts4-geodata": "^4.1.28",
+    "@amcharts/amcharts4-geodata": "^4.1.30",
     "@codemirror/commands": "^6.6.0",
     "@codemirror/lang-xml": "^6.1.0",
     "@codemirror/language": "^6.10.2",
     "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.28.3",
-    "@floating-ui/dom": "^1.6.7",
+    "@codemirror/view": "^6.29.1",
+    "@floating-ui/dom": "^1.6.8",
     "@github/clipboard-copy-element": "^1.3.0",
     "@github/hotkey": "^3.1.1",
     "@github/markdown-toolbar-element": "^2.2.3",
@@ -48,49 +48,49 @@
     "leaflet": "^1.9.4",
     "leaflet.markercluster": "^1.5.3",
     "lit": "^3.1.4",
-    "marked": "^13.0.1",
-    "wavesurfer.js": "^7.8.0",
-    "xml-formatter": "^3.6.2"
+    "marked": "^13.0.3",
+    "wavesurfer.js": "^7.8.2",
+    "xml-formatter": "^3.6.3"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.3.0",
     "@commitlint/config-conventional": "^19.2.2",
-    "@csstools/css-tokenizer": "^2.3.2",
+    "@csstools/css-tokenizer": "^2.4.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@semantic-release/gitlab": "^13.1.0",
+    "@semantic-release/gitlab": "^13.2.0",
     "@tailwindcss/forms": "^0.5.7",
     "@tailwindcss/typography": "^0.5.13",
     "@types/leaflet": "^1.9.12",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.14.1",
     "all-contributors-cli": "^6.26.1",
     "commitizen": "^4.3.0",
     "cross-env": "^7.0.3",
-    "cssnano": "^7.0.3",
+    "cssnano": "^7.0.4",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "husky": "^9.0.11",
+    "eslint-plugin-prettier": "^5.2.1",
+    "husky": "^9.1.4",
     "is-ci": "^3.0.1",
     "lint-staged": "^15.2.7",
-    "postcss": "^8.4.39",
+    "postcss": "^8.4.40",
     "postcss-import": "^16.1.0",
     "postcss-nesting": "^12.1.5",
-    "postcss-preset-env": "^9.5.15",
+    "postcss-preset-env": "^9.6.0",
     "postcss-reporter": "^7.1.0",
-    "prettier": "3.3.2",
-    "prettier-plugin-organize-imports": "^3.2.4",
+    "prettier": "3.3.3",
+    "prettier-plugin-organize-imports": "^4.0.0",
     "semantic-release": "^24.0.0",
-    "stylelint": "^16.6.1",
+    "stylelint": "^16.8.1",
     "stylelint-config-standard": "^36.0.1",
     "svgo": "^3.3.2",
-    "tailwindcss": "^3.4.4",
-    "typescript": "^5.5.2",
-    "vite": "^5.3.2",
-    "vite-plugin-pwa": "^0.20.0",
+    "tailwindcss": "^3.4.7",
+    "typescript": "^5.5.4",
+    "vite": "^5.3.5",
+    "vite-plugin-pwa": "^0.20.1",
     "workbox-build": "^7.1.1",
     "workbox-core": "^7.1.0",
     "workbox-routing": "^7.1.0",