CHANGELOG.md

+## [1.12.4](https://code.castopod.org/adaures/castopod/compare/v1.12.3...v1.12.4) (2024-07-30)
+
+### Bug Fixes
+
+- **icons:** set correct names for lock and lock-unlock icons in premium banner
+  ([94deaab](https://code.castopod.org/adaures/castopod/commit/94deaab3cd0912ff1a585bee174a096a84c68384))
+- **premium-podcasts:** update query to validate subscription
+  ([0e6d294](https://code.castopod.org/adaures/castopod/commit/0e6d2945f215453abbe7d9f90afd012d2507846b))
+
 ## [1.12.3](https://code.castopod.org/adaures/castopod/compare/v1.12.2...v1.12.3) (2024-07-04)
 
 ### 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.3');
+defined('CP_VERSION') || define('CP_VERSION', '1.12.4');
 
 /*
  | --------------------------------------------------------------------

composer.json

 {
   "name": "adaures/castopod",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "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",

modules/PremiumPodcasts/Models/SubscriptionModel.php

@@ -116,11 +116,13 @@ class SubscriptionModel extends Model
 
         return $subscriptionModel
             ->where([
-                'token'      => hash('sha256', $token),
-                'status'     => 'active',
-                'expires_at' => null,
+                'token'  => hash('sha256', $token),
+                'status' => 'active',
             ])
+            ->groupStart()
+            ->where('expires_at', null)
             ->orWhere('`expires_at` > UTC_TIMESTAMP()', null, false)
+            ->groupEnd()
             ->first();
     }
 

package.json

 {
   "name": "castopod",
-  "version": "1.12.3",
+  "version": "1.12.4",
   "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",

themes/cp_app/podcast/_partials/premium_banner.php

@@ -4,8 +4,10 @@ if ($podcast->is_premium): ?>
     <?php
         $isUnlocked = service('premium_podcasts')
             ->isUnlocked($podcast->handle);
-    $shownIcon = $isUnlocked ? 'lock-unlock' : 'lock';
-    $hiddenIcon = $isUnlocked ? 'lock' : 'lock-unlock';
+    // @icon('lock-unlock-fill')
+    // @icon('lock-fill')
+    $shownIcon = $isUnlocked ? 'lock-unlock-fill' : 'lock-fill';
+    $hiddenIcon = $isUnlocked ? 'lock-fill' : 'lock-unlock-fill';
     ?>
     <div class="flex flex-col items-center justify-between col-start-2 px-2 py-1 mt-2 sm:px-1 md:mt-4 rounded-conditional-full gap-y-2 sm:flex-row bg-accent-base gap-x-2 text-accent-contrast">
         <p class="inline-flex items-center text-sm md:pl-4 gap-x-2"><?= $isUnlocked ? lang('PremiumPodcasts.banner_lock') : lang('PremiumPodcasts.banner_unlock') ?></p>