Compare revisions

00870cef · 00870cef · 00870cef · 00870cef · 00870cef · 00870cef
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace Config;
 /**
- * Mimes
- *
 * This file contains an array of mime types.  It is used by the Upload class to help identify allowed file types.
 *
 * When more than one variation for an extension exist (like jpg, jpeg, etc) the most common one should be first in the
@@ -22,7 +20,7 @@ class Mimes
    /**
     * Map of extensions to mime types.
     *
-     * @var array<string, string|string[]>
+     * @var array<string, list<string>|string>
     */
    public static $mimes = [
        'hqx' => [
@@ -310,7 +308,7 @@ class Mimes
     * @param string|null $proposedExtension - default extension (in case there is more than one with the same mime type)
     * @return string|null The extension determined, or null if unable to match.
     */
-    public static function guessExtensionFromType(string $type, string $proposedExtension = null): ?string
+    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null): ?string
    {
        $type = trim(strtolower($type), '. ');

--- a/app/Config/Optimize.php
+++ b/app/Config/Optimize.php
+<?php
+declare(strict_types=1);
+namespace Config;
+/**
+ * Optimization Configuration.
+ *
+ * NOTE: This class does not extend BaseConfig for performance reasons.
+ *       So you cannot replace the property values with Environment Variables.
+ *
+ * @immutable
+ */
+class Optimize
+{
+    /**
+     * --------------------------------------------------------------------------
+     * Config Caching
+     * --------------------------------------------------------------------------
+     *
+     * @see https://codeigniter.com/user_guide/concepts/factories.html#config-caching
+     */
+    public bool $configCacheEnabled = false;
+    /**
+     * --------------------------------------------------------------------------
+     * Config Caching
+     * --------------------------------------------------------------------------
+     *
+     * @see https://codeigniter.com/user_guide/concepts/autoloader.html#file-locator-caching
+     */
+    public bool $locatorCacheEnabled = false;
+}
--- a/app/Config/Paths.php
+++ b/app/Config/Paths.php
@@ -5,8 +5,6 @@ declare(strict_types=1);
 namespace Config;
 /**
- * Paths
- *
 * Holds the paths that are used by the system to locate the main directories, app, system, etc.
 *
 * Modifying these allows you to restructure your application, share a system folder between multiple applications, and
@@ -72,7 +70,7 @@ class Paths
     * This variable must contain the name of the directory that
     * contains the view files used by your application. By
     * default this is in `app/Views`. This value
-     * is used when no value is provided to `Services::renderer()`.
+     * is used when no value is provided to `service('renderer')`.
     */
    public string $viewDirectory = __DIR__ . '/../Views';
 }
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -15,7 +15,6 @@ use CodeIgniter\Router\RouteCollection;
 $routes->addPlaceholder('podcastHandle', '[a-zA-Z0-9\_]{1,32}');
 $routes->addPlaceholder('slug', '[a-zA-Z0-9\-]{1,128}');
 $routes->addPlaceholder('base64', '[A-Za-z0-9\.\_]+\-{0,2}');
-$routes->addPlaceholder('platformType', '\bpodcasting|\bsocial|\bfunding');
 $routes->addPlaceholder('postAction', '\bfavourite|\breblog|\breply');
 $routes->addPlaceholder('embedTheme', '\blight|\bdark|\blight-transparent|\bdark-transparent');
 $routes->addPlaceholder(
@@ -128,6 +127,9 @@ $routes->group('@(:podcastHandle)', static function ($routes): void {
        $routes->get('chapters', 'EpisodeController::chapters/$1/$2', [
            'as' => 'episode-chapters',
        ]);
+        $routes->get('transcript', 'EpisodeController::transcript/$1/$2', [
+            'as' => 'episode-transcript',
+        ]);
        $routes->options('comments', 'ActivityPubController::preflight');
        $routes->get('comments', 'EpisodeController::comments/$1/$2', [
            'as'                        => 'episode-comments',
@@ -159,7 +161,7 @@ $routes->group('@(:podcastHandle)', static function ($routes): void {
        $routes->get('comments/(:uuid)/replies', 'EpisodeCommentController::replies/$1/$2/$3', [
            'as' => 'episode-comment-replies',
        ]);
-        $routes->post('comments/(:uuid)/like', 'EpisodeCommentController::attemptLike/$1/$2/$3', [
+        $routes->post('comments/(:uuid)/like', 'EpisodeCommentController::likeAction/$1/$2/$3', [
            'as' => 'episode-comment-attempt-like',
        ]);
        $routes->get('oembed.json', 'EpisodeController::oembedJSON/$1/$2', [
@@ -205,6 +207,9 @@ $routes->get('/p/(:uuid)/activity', 'EpisodePreviewController::activity/$1', [
 $routes->get('/p/(:uuid)/chapters', 'EpisodePreviewController::chapters/$1', [
    'as' => 'episode-preview-chapters',
 ]);
+$routes->get('/p/(:uuid)/transcript', 'EpisodePreviewController::transcript/$1', [
+    'as' => 'episode-preview-transcript',
+]);
 // Other pages
 $routes->get('/credits', 'CreditsController', [
@@ -224,9 +229,9 @@ $routes->get('/pages/(:slug)', 'PageController::index/$1', [
 * Overwriting Fediverse routes file
 */
 $routes->group('@(:podcastHandle)', static function ($routes): void {
-    $routes->post('posts/new', 'PostController::attemptCreate/$1', [
+    $routes->post('posts/new', 'PostController::createAction/$1', [
        'as'     => 'post-attempt-create',
-        'filter' => 'permission:podcast#.manage-publications',
+        'filter' => 'permission:podcast$1.manage-publications',
    ]);
    // Post
    $routes->group('posts/(:uuid)', static function ($routes): void {
@@ -261,13 +266,13 @@ $routes->group('@(:podcastHandle)', static function ($routes): void {
            'filter' => 'allow-cors',
        ]);
        // Actions
-        $routes->post('action', 'PostController::attemptAction/$1/$2', [
+        $routes->post('action', 'PostController::action/$1/$2', [
            'as'     => 'post-attempt-action',
-            'filter' => 'permission:podcast#.interact-as',
+            'filter' => 'permission:podcast$1.interact-as',
        ]);
        $routes->post(
            'block-actor',
-            'PostController::attemptBlockActor/$1/$2',
+            'PostController::blockActorAction/$1/$2',
            [
                'as'     => 'post-attempt-block-actor',
                'filter' => 'permission:fediverse.manage-blocks',
@@ -275,25 +280,25 @@ $routes->group('@(:podcastHandle)', static function ($routes): void {
        );
        $routes->post(
            'block-domain',
-            'PostController::attemptBlockDomain/$1/$2',
+            'PostController::blockDomainAction/$1/$2',
            [
                'as'     => 'post-attempt-block-domain',
                'filter' => 'permission:fediverse.manage-blocks',
            ],
        );
-        $routes->post('delete', 'PostController::attemptDelete/$1/$2', [
+        $routes->post('delete', 'PostController::deleteAction/$1/$2', [
            'as'     => 'post-attempt-delete',
-            'filter' => 'permission:podcast#.manage-publications',
+            'filter' => 'permission:podcast$1.manage-publications',
        ]);
        $routes->get(
            'remote/(:postAction)',
-            'PostController::remoteAction/$1/$2/$3',
+            'PostController::remoteActionAction/$1/$2/$3',
            [
                'as' => 'post-remote-action',
            ],
        );
    });
-    $routes->get('follow', 'ActorController::follow/$1', [
+    $routes->get('follow', 'ActorController::followView/$1', [
        'as' => 'follow',
    ]);
    $routes->get('outbox', 'ActorController::outbox/$1', [

--- a/app/Config/Routing.php
+++ b/app/Config/Routing.php
@@ -12,13 +12,14 @@ use CodeIgniter\Config\Routing as BaseRouting;
 class Routing extends BaseRouting
 {
    /**
+     * For Defined Routes.
     * An array of files that contain route definitions.
     * Route files are read in order, with the first match
     * found taking precedence.
     *
     * Default: APPPATH . 'Config/Routes.php'
     *
-     * @var string[]
+     * @var list<string>
     */
    public array $routeFiles = [
        APPPATH . 'Config/Routes.php',
@@ -28,11 +29,13 @@ class Routing extends BaseRouting
        ROOTPATH . 'modules/Auth/Config/Routes.php',
        ROOTPATH . 'modules/Fediverse/Config/Routes.php',
        ROOTPATH . 'modules/Install/Config/Routes.php',
+        ROOTPATH . 'modules/Platforms/Config/Routes.php',
        ROOTPATH . 'modules/PodcastImport/Config/Routes.php',
        ROOTPATH . 'modules/PremiumPodcasts/Config/Routes.php',
    ];
    /**
+     * For Defined Routes and Auto Routing.
     * The default namespace to use for Controllers when no other
     * namespace has been specified.
     *
@@ -41,6 +44,7 @@ class Routing extends BaseRouting
    public string $defaultNamespace = 'App\Controllers';
    /**
+     * For Auto Routing.
     * The default controller to use when no other controller has been
     * specified.
     *
@@ -49,6 +53,7 @@ class Routing extends BaseRouting
    public string $defaultController = 'HomeController';
    /**
+     * For Defined Routes and Auto Routing.
     * The default method to call on the controller when no other
     * method has been set in the route.
     *
@@ -57,7 +62,8 @@ class Routing extends BaseRouting
    public string $defaultMethod = 'index';
    /**
-     * Whether to translate dashes in URIs to underscores.
+     * For Auto Routing.
+     * Whether to translate dashes in URIs for controller/method to underscores.
     * Primarily useful when using the auto-routing.
     *
     * Default: false
@@ -66,13 +72,12 @@ class Routing extends BaseRouting
    /**
     * Sets the class/method that should be called if routing doesn't
-     * find a match. It can be either a closure or the controller/method
+     * find a match. It can be the controller/method name like: Users::index
-     * name exactly like a route is defined: Users::index
     *
     * This setting is passed to the Router class and handled there.
     *
     * If you want to use a closure, you will have to set it in the
-     * class constructor or the routes file by calling:
+     * routes file by calling:
     *
     * $routes->set404Override(function() {
     *    // Do something here
@@ -94,6 +99,7 @@ class Routing extends BaseRouting
    public bool $autoRoute = false;
    /**
+     * For Defined Routes.
     * If TRUE, will enable the use of the 'prioritize' option
     * when defining routes.
     *
@@ -102,7 +108,16 @@ class Routing extends BaseRouting
    public bool $prioritize = false;
    /**
-     * Map of URI segments and namespaces. For Auto Routing (Improved).
+     * For Defined Routes.
+     * If TRUE, matched multiple URI segments will be passed as one parameter.
+     *
+     * Default: false
+     */
+    public bool $multipleSegmentsOneParam = false;
+    /**
+     * For Auto Routing (Improved).
+     * Map of URI segments and namespaces.
     *
     * The key is the first URI segment. The value is the controller namespace.
     * E.g.,
@@ -113,4 +128,15 @@ class Routing extends BaseRouting
     * @var array<string, string> [ uri_segment => namespace ]
     */
    public array $moduleRoutes = [];
+    /**
+     * For Auto Routing (Improved).
+     * Whether to translate dashes in URIs for controller/method to CamelCase.
+     * E.g., blog-controller -> BlogController
+     *
+     * If you enable this, $translateURIDashes is ignored.
+     *
+     * Default: false
+     */
+    public bool $translateUriToCamelCase = true;
 }
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -80,26 +80,7 @@ class Security extends BaseConfig
     * CSRF Redirect
     * --------------------------------------------------------------------------
     *
-     * Redirect to previous page with error on failure.
+     * @see https://codeigniter4.github.io/userguide/libraries/security.html#redirection-on-failure
     */
-    public bool $redirect = false;
+    public bool $redirect = (ENVIRONMENT === 'production');
-    /**
-     * --------------------------------------------------------------------------
-     * CSRF SameSite
-     * --------------------------------------------------------------------------
-     *
-     * Setting for CSRF SameSite cookie token.
-     *
-     * Allowed values are: None - Lax - Strict - ''.
-     *
-     * Defaults to `Lax` as recommended in this link:
-     *
-     * @see https://portswigger.net/web-security/csrf/samesite-cookies
-     *
-     * @var string
-     *
-     * @deprecated `Config\Cookie` $samesite property is used.
-     */
-    public $samesite = 'Lax';
 }
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Config;
 use App\Libraries\Breadcrumb;
+use App\Libraries\HtmlHead;
 use App\Libraries\Negotiate;
 use App\Libraries\Router;
 use CodeIgniter\Config\BaseService;
@@ -31,14 +32,14 @@ class Services extends BaseService
    public static function router(
        ?RouteCollectionInterface $routes = null,
        ?Request $request = null,
-        bool $getShared = true
+        bool $getShared = true,
    ): Router {
        if ($getShared) {
            return static::getSharedInstance('router', $routes, $request);
        }
-        $routes = $routes ?? static::routes();
+        $routes ??= static::routes();
-        $request = $request ?? static::request();
+        $request ??= static::request();
        return new Router($routes, $request);
    }
@@ -53,7 +54,7 @@ class Services extends BaseService
            return static::getSharedInstance('negotiator', $request);
        }
-        $request = $request ?? static::request();
+        $request ??= static::request();
        return new Negotiate($request);
    }
@@ -66,4 +67,13 @@ class Services extends BaseService
        return new Breadcrumb();
    }
+    public static function html_head(bool $getShared = true): HtmlHead
+    {
+        if ($getShared) {
+            return self::getSharedInstance('html_head');
+        }
+        return new HtmlHead();
+    }
 }
--- a/app/Config/Session.php
+++ b/app/Config/Session.php
@@ -101,4 +101,29 @@ class Session extends BaseConfig
     * DB Group for the database session.
     */
    public ?string $DBGroup = null;
+    /**
+     * --------------------------------------------------------------------------
+     * Lock Retry Interval (microseconds)
+     * --------------------------------------------------------------------------
+     *
+     * This is used for RedisHandler.
+     *
+     * Time (microseconds) to wait if lock cannot be acquired.
+     * The default is 100,000 microseconds (= 0.1 seconds).
+     */
+    public int $lockRetryInterval = 100_000;
+    /**
+     * --------------------------------------------------------------------------
+     * Lock Max Retries
+     * --------------------------------------------------------------------------
+     *
+     * This is used for RedisHandler.
+     *
+     * Maximum number of lock acquisition attempts.
+     * The default is 300 times. That is lock timeout is about 30 (0.1 * 300)
+     * seconds.
+     */
+    public int $lockMaxRetries = 300;
 }
--- a/app/Config/Tasks.php
+++ b/app/Config/Tasks.php
@@ -51,5 +51,9 @@ class Tasks extends BaseConfig
        $schedule->command('podcast:import')
            ->everyMinute()
            ->named('podcast-import');
+        $schedule->command('episodes:compute-downloads')
+            ->everyHour()
+            ->named('episodes:compute-downloads');
    }
 }
--- a/app/Config/Toolbar.php
+++ b/app/Config/Toolbar.php
@@ -33,7 +33,7 @@ class Toolbar extends BaseConfig
     * List of toolbar collectors that will be called when Debug Toolbar
     * fires up and collects data from.
     *
-     * @var string[]
+     * @var list<class-string>
     */
    public array $collectors = [
        Timers::class,
@@ -51,7 +51,7 @@ class Toolbar extends BaseConfig
     * Collect Var Data
     * --------------------------------------------------------------------------
     *
-     * If set to false var data from the views will not be colleted. Useful to
+     * If set to false var data from the views will not be collected. Useful to
     * avoid high memory usage when there are lots of data passed to the view.
     */
    public bool $collectVarData = true;
@@ -102,7 +102,7 @@ class Toolbar extends BaseConfig
     *
     * NOTE: The ROOTPATH will be prepended to all values.
     *
-     * @var string[]
+     * @var list<string>
     */
    public array $watchedDirectories = ['app', 'modules', 'themes'];
@@ -114,7 +114,7 @@ class Toolbar extends BaseConfig
     * Contains an array of file extensions that will be watched for changes and
     * used to determine if the hot-reload feature should reload the page or not.
     *
-     * @var string[]
+     * @var list<string>
     */
    public array $watchedExtensions = ['php', 'css', 'js', 'html', 'svg', 'json', 'env'];
 }
--- a/app/Config/Validation.php
+++ b/app/Config/Validation.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Config;
 use App\Validation\FileRules as AppFileRules;
+use App\Validation\OtherRules;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Validation\StrictRules\CreditCardRules;
 use CodeIgniter\Validation\StrictRules\FileRules;
@@ -16,7 +17,7 @@ class Validation extends BaseConfig
    /**
     * Stores the classes that contain the rules that are available.
     *
-     * @var string[]
+     * @var list<string>
     */
    public array $ruleSets = [
        Rules::class,
@@ -24,6 +25,7 @@ class Validation extends BaseConfig
        FileRules::class,
        CreditCardRules::class,
        AppFileRules::class,
+        OtherRules::class,
    ];
    /**

--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -9,8 +9,8 @@ use CodeIgniter\View\ViewDecoratorInterface;
 use ViewComponents\Decorator;
 /**
- * @phpstan-type ParserCallable (callable(mixed): mixed)
+ * @phpstan-type parser_callable (callable(mixed): mixed)
- * @phpstan-type ParserCallableString (callable(mixed): mixed)&string
+ * @phpstan-type parser_callable_string (callable(mixed): mixed)&string
 */
 class View extends BaseView
 {
@@ -31,8 +31,8 @@ class View extends BaseView
     *
     * Examples: { title|esc(js) } { created_on|date(Y-m-d)|esc(attr) }
     *
-     * @var array<string, string>
+     * @var         array<string, string>
-     * @phpstan-var array<string, ParserCallableString>
+     * @phpstan-var array<string, parser_callable_string>
     */
    public $filters = [];
@@ -40,8 +40,8 @@ class View extends BaseView
     * Parser Plugins provide a way to extend the functionality provided by the core Parser by creating aliases that
     * will be replaced with any callable. Can be single or tag pair.
     *
-     * @var array<string, array<string>|callable|string>
+     * @var         array<string, callable|list<string>|string>
-     * @phpstan-var array<string, array<ParserCallableString>|ParserCallableString|ParserCallable>
+     * @phpstan-var array<string, list<parser_callable_string>|parser_callable_string|parser_callable>
     */
    public $plugins = [];
@@ -51,7 +51,7 @@ class View extends BaseView
     *
     * All classes must implement CodeIgniter\View\ViewDecoratorInterface
     *
-     * @var class-string<ViewDecoratorInterface>[]
+     * @var list<class-string<ViewDecoratorInterface>>
     */
    public array $decorators = [Decorator::class];
 }
--- a/app/Config/Vite.php
+++ b/app/Config/Vite.php
+<?php
+// app/Config/Vite.php
+declare(strict_types=1);
+namespace Config;
+use CodeIgniterVite\Config\Vite as ViteConfig;
+class Vite extends ViteConfig
+{
+    public function __construct()
+    {
+        parent::__construct();
+        $adminGateway = config('Admin')
+            ->gateway;
+        $installGateway = config('Install')
+            ->gateway;
+        $this->routesAssets = [
+            [
+                'routes'  => ['*'],
+                'exclude' => [$adminGateway . '*', $installGateway . '*'],
+                'assets'  => ['styles/site.css', 'js/app.ts', 'js/podcast.ts', 'js/audio-player.ts'],
+            ],
+            [
+                'routes' => ['/map'],
+                'assets' => ['js/map.ts'],
+            ],
+            [
+                'routes' => ['/' . $adminGateway . '*'],
+                'assets' => ['styles/admin.css', 'js/admin.ts', 'js/admin-audio-player.ts'],
+            ],
+            [
+                'routes' => [$installGateway . '*'],
+                'assets' => ['styles/install.css'],
+            ],
+        ];
+    }
+}
--- a/app/Controllers/ActorController.php
+++ b/app/Controllers/ActorController.php
@@ -18,23 +18,20 @@ class ActorController extends FediverseActorController
    use AnalyticsTrait;
    /**
-     * @var string[]
+     * @var list<string>
     */
    protected $helpers = ['svg', 'components', 'misc', 'seo'];
-    public function follow(): string
+    public function followView(): string
    {
-        // Prevent analytics hit when authenticated
+        // @phpstan-ignore-next-line
-        if (! auth()->loggedIn()) {
+        $this->registerPodcastWebpageHit($this->actor->podcast->id);
-            // @phpstan-ignore-next-line
-            $this->registerPodcastWebpageHit($this->actor->podcast->id);
-        }
        helper(['form', 'components', 'svg']);
+        // @phpstan-ignore-next-line
+        set_follow_metatags($this->actor);
        $data = [
-            // @phpstan-ignore-next-line
+            'actor' => $this->actor,
-            'metatags' => get_follow_metatags($this->actor),
-            'actor'    => $this->actor,
        ];
        return view('podcast/follow', $data);

--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -5,16 +5,13 @@ declare(strict_types=1);
 namespace App\Controllers;
 use CodeIgniter\Controller;
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
+use Override;
 use Psr\Log\LoggerInterface;
 use ViewThemes\Theme;
 /**
- * Class BaseController
- *
 * BaseController provides a convenient place for loading components and performing functions that are needed by all
 * your controllers. Extend this class in any new controllers: class Home extends BaseController
 *
@@ -22,26 +19,12 @@ use ViewThemes\Theme;
 */
 abstract class BaseController extends Controller
 {
-    /**
-     * Instance of the main Request object.
-     *
-     * @var IncomingRequest
-     */
-    protected $request;
-    /**
-     * Instance of the main response object.
-     *
-     * @var Response
-     */
-    protected $response;
    /**
     * An array of helpers to be loaded automatically upon
     * class instantiation. These helpers will be available
     * to all other controllers that extend BaseController.
     *
-     * @var string[]
+     * @var list<string>
     */
    protected $helpers = [];
@@ -51,13 +34,11 @@ abstract class BaseController extends Controller
     */
    // protected $session;
-    /**
+    #[Override]
-     * Constructor.
-     */
    public function initController(
        RequestInterface $request,
        ResponseInterface $response,
-        LoggerInterface $logger
+        LoggerInterface $logger,
    ): void {
        $this->helpers = [...$this->helpers, 'svg', 'components', 'misc', 'seo', 'premium_podcasts'];

--- a/app/Controllers/ColorsController.php
+++ b/app/Controllers/ColorsController.php
@@ -11,25 +11,17 @@ declare(strict_types=1);
 namespace App\Controllers;
 use CodeIgniter\Controller;
-use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
-use Config\Colors;
 class ColorsController extends Controller
 {
-    /**
+    public function index(): ResponseInterface
-     * Instance of the main response object.
-     *
-     * @var Response
-     */
-    protected $response;
-    public function index(): Response
    {
        $cacheName = 'colors.css';
        if (
            ! ($colorsCssBody = cache($cacheName))
        ) {
-            $colorThemes = config(Colors::class)
+            $colorThemes = config('Colors')
                ->themes;
            $colorsCssBody = '';

--- a/app/Controllers/CreditsController.php
+++ b/app/Controllers/CreditsController.php
@@ -164,10 +164,10 @@ class CreditsController extends BaseController
                }
            }
+            set_page_metatags($page);
            $data = [
-                'metatags' => get_page_metatags($page),
+                'page'    => $page,
-                'page'     => $page,
+                'credits' => $credits,
-                'credits'  => $credits,
            ];
            $found = view('pages/credits', $data);

--- a/app/Controllers/EpisodeAudioController.php
+++ b/app/Controllers/EpisodeAudioController.php
@@ -16,31 +16,23 @@ use App\Models\EpisodeModel;
 use App\Models\PodcastModel;
 use CodeIgniter\Controller;
 use CodeIgniter\Exceptions\PageNotFoundException;
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
-use Config\Services;
 use Modules\Analytics\Config\Analytics;
 use Modules\PremiumPodcasts\Entities\Subscription;
 use Modules\PremiumPodcasts\Models\SubscriptionModel;
+use Override;
 use Psr\Log\LoggerInterface;
 class EpisodeAudioController extends Controller
 {
-    /**
-     * Instance of the main Request object.
-     *
-     * @var IncomingRequest
-     */
-    protected $request;
    /**
     * An array of helpers to be loaded automatically upon class instantiation. These helpers will be available to all
     * other controllers that extend Analytics.
     *
-     * @var string[]
+     * @var list<string>
     */
    protected $helpers = ['analytics'];
@@ -50,13 +42,11 @@ class EpisodeAudioController extends Controller
    protected Analytics $analyticsConfig;
-    /**
+    #[Override]
-     * Constructor.
-     */
    public function initController(
        RequestInterface $request,
        ResponseInterface $response,
-        LoggerInterface $logger
+        LoggerInterface $logger,
    ): void {
        // Do Not Edit This Line
        parent::initController($request, $response, $logger);
@@ -103,7 +93,7 @@ class EpisodeAudioController extends Controller
        // check if podcast is already unlocked before any token validation
        if ($this->episode->is_premium && ! ($subscription = service('premium_podcasts')->subscription(
-            $this->episode->podcast->handle
+            $this->episode->podcast->handle,
        )) instanceof Subscription) {
            // look for token as GET parameter
            if (($token = $this->request->getGet('token')) === null) {
@@ -120,7 +110,7 @@ class EpisodeAudioController extends Controller
            // check if there's a valid subscription for the provided token
            if (! ($subscription = (new SubscriptionModel())->validateSubscription(
                $this->episode->podcast->handle,
-                $token
+                $token,
            )) instanceof Subscription) {
                return $this->response->setStatusCode(401, 'Invalid token!')
                    ->setJSON([
@@ -133,7 +123,7 @@ class EpisodeAudioController extends Controller
            }
        }
-        $session = Services::session();
+        $session = service('session');
        $serviceName = '';
        if ($this->request->getGet('_from')) {
@@ -164,7 +154,7 @@ class EpisodeAudioController extends Controller
            $audioDuration,
            $this->episode->published_at->getTimestamp(),
            $serviceName,
-            $subscription instanceof Subscription ? $subscription->id : null
+            $subscription instanceof Subscription ? $subscription->id : null,
        );
        $audioFileURI = new URI(service('file_manager')->getUrl($this->episode->audio->file_key));

--- a/app/Controllers/EpisodeCommentController.php
+++ b/app/Controllers/EpisodeCommentController.php
@@ -16,11 +16,10 @@ use App\Entities\Podcast;
 use App\Libraries\CommentObject;
 use App\Models\EpisodeCommentModel;
 use App\Models\EpisodeModel;
-use App\Models\LikeModel;
 use App\Models\PodcastModel;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\RedirectResponse;
-use CodeIgniter\HTTP\Response;
+use CodeIgniter\HTTP\ResponseInterface;
 use Modules\Analytics\AnalyticsTrait;
 use Modules\Fediverse\Entities\Actor;
 use Modules\Fediverse\Objects\OrderedCollectionObject;
@@ -78,10 +77,7 @@ class EpisodeCommentController extends BaseController
    public function view(): string
    {
-        // Prevent analytics hit when authenticated
+        $this->registerPodcastWebpageHit($this->podcast->id);
-        if (! auth()->loggedIn()) {
-            $this->registerPodcastWebpageHit($this->podcast->id);
-        }
        $cacheName = implode(
            '_',
@@ -97,12 +93,12 @@ class EpisodeCommentController extends BaseController
        );
        if (! ($cachedView = cache($cacheName))) {
+            set_episode_comment_metatags($this->comment);
            $data = [
-                'metatags' => get_episode_comment_metatags($this->comment),
+                'podcast' => $this->podcast,
-                'podcast'  => $this->podcast,
+                'actor'   => $this->actor,
-                'actor'    => $this->actor,
+                'episode' => $this->episode,
-                'episode'  => $this->episode,
+                'comment' => $this->comment,
-                'comment'  => $this->comment,
            ];
            // if user is logged in then send to the authenticated activity view
@@ -120,7 +116,7 @@ class EpisodeCommentController extends BaseController
        return $cachedView;
    }
-    public function commentObject(): Response
+    public function commentObject(): ResponseInterface
    {
        $commentObject = new CommentObject($this->comment);
@@ -129,7 +125,7 @@ class EpisodeCommentController extends BaseController
            ->setBody($commentObject->toJSON());
    }
-    public function replies(): Response
+    public function replies(): ResponseInterface
    {
        /**
         * get comment replies
@@ -164,25 +160,25 @@ class EpisodeCommentController extends BaseController
            ->setBody($collection->toJSON());
    }
-    public function attemptLike(): RedirectResponse
+    public function likeAction(): RedirectResponse
    {
        if (! ($interactAsActor = interact_as_actor()) instanceof Actor) {
            return redirect()->back();
        }
-        model(LikeModel::class)
+        model('LikeModel')
            ->toggleLike($interactAsActor, $this->comment);
        return redirect()->back();
    }
-    public function attemptReply(): RedirectResponse
+    public function replyAction(): RedirectResponse
    {
        if (! ($interactAsActor = interact_as_actor()) instanceof Actor) {
            return redirect()->back();
        }
-        model(LikeModel::class)
+        model('LikeModel')
            ->toggleLike($interactAsActor, $this->comment);
        return redirect()->back();

--- a/app/Controllers/EpisodeController.php
+++ b/app/Controllers/EpisodeController.php
@@ -16,14 +16,10 @@ use App\Libraries\NoteObject;
 use App\Libraries\PodcastEpisode;
 use App\Models\EpisodeModel;
 use App\Models\PodcastModel;
-use App\Models\PostModel;
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Exceptions\PageNotFoundException;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Embed;
-use Config\Images;
-use Config\Services;
 use Modules\Analytics\AnalyticsTrait;
 use Modules\Fediverse\Objects\OrderedCollectionObject;
 use Modules\Fediverse\Objects\OrderedCollectionPage;
@@ -68,10 +64,7 @@ class EpisodeController extends BaseController
    public function index(): string
    {
-        // Prevent analytics hit when authenticated
+        $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        if (! auth()->loggedIn()) {
-            $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        }
        $cacheName = implode(
            '_',
@@ -88,10 +81,10 @@ class EpisodeController extends BaseController
        );
        if (! ($cachedView = cache($cacheName))) {
+            set_episode_metatags($this->episode);
            $data = [
-                'metatags' => get_episode_metatags($this->episode),
+                'podcast' => $this->podcast,
-                'podcast'  => $this->podcast,
+                'episode' => $this->episode,
-                'episode'  => $this->episode,
            ];
            $secondsToNextUnpublishedEpisode = (new EpisodeModel())->getSecondsToNextUnpublishedEpisode(
@@ -106,9 +99,7 @@ class EpisodeController extends BaseController
            // The page cache is set to a decade so it is deleted manually upon podcast update
            return view('episode/comments', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
-                ? $secondsToNextUnpublishedEpisode
-                : DECADE,
                'cache_name' => $cacheName,
            ]);
        }
@@ -118,10 +109,7 @@ class EpisodeController extends BaseController
    public function activity(): string
    {
-        // Prevent analytics hit when authenticated
+        $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        if (! auth()->loggedIn()) {
-            $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        }
        $cacheName = implode(
            '_',
@@ -139,10 +127,10 @@ class EpisodeController extends BaseController
        );
        if (! ($cachedView = cache($cacheName))) {
+            set_episode_metatags($this->episode);
            $data = [
-                'metatags' => get_episode_metatags($this->episode),
+                'podcast' => $this->podcast,
-                'podcast'  => $this->podcast,
+                'episode' => $this->episode,
-                'episode'  => $this->episode,
            ];
            $secondsToNextUnpublishedEpisode = (new EpisodeModel())->getSecondsToNextUnpublishedEpisode(
@@ -157,9 +145,7 @@ class EpisodeController extends BaseController
            // The page cache is set to a decade so it is deleted manually upon podcast update
            return view('episode/activity', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
                'cache_name' => $cacheName,
            ]);
        }
@@ -167,12 +153,9 @@ class EpisodeController extends BaseController
        return $cachedView;
    }
-    public function chapters(): String
+    public function chapters(): string
    {
-        // Prevent analytics hit when authenticated
+        $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        if (! auth()->loggedIn()) {
-            $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        }
        $cacheName = implode(
            '_',
@@ -190,13 +173,13 @@ class EpisodeController extends BaseController
        );
        if (! ($cachedView = cache($cacheName))) {
-            // get chapters from json file
+            set_episode_metatags($this->episode);
            $data = [
-                'metatags' => get_episode_metatags($this->episode),
+                'podcast' => $this->podcast,
-                'podcast'  => $this->podcast,
+                'episode' => $this->episode,
-                'episode'  => $this->episode,
            ];
+            // get chapters from json file
            if (isset($this->episode->chapters->file_key)) {
                /** @var FileManagerInterface $fileManager */
                $fileManager = service('file_manager');
@@ -218,9 +201,68 @@ class EpisodeController extends BaseController
            // The page cache is set to a decade so it is deleted manually upon podcast update
            return view('episode/chapters', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
-                    ? $secondsToNextUnpublishedEpisode
+                'cache_name' => $cacheName,
-                    : DECADE,
+            ]);
+        }
+        return $cachedView;
+    }
+    public function transcript(): string
+    {
+        $this->registerPodcastWebpageHit($this->episode->podcast_id);
+        $cacheName = implode(
+            '_',
+            array_filter([
+                'page',
+                "podcast#{$this->podcast->id}",
+                "episode#{$this->episode->id}",
+                'transcript',
+                service('request')
+                    ->getLocale(),
+                is_unlocked($this->podcast->handle) ? 'unlocked' : null,
+                auth()
+                    ->loggedIn() ? 'authenticated' : null,
+            ]),
+        );
+        if (! ($cachedView = cache($cacheName))) {
+            set_episode_metatags($this->episode);
+            $data = [
+                'podcast' => $this->podcast,
+                'episode' => $this->episode,
+            ];
+            // get transcript from json file
+            if ($this->episode->transcript !== null) {
+                $data['transcript'] = $this->episode->transcript;
+                if ($this->episode->transcript->json_key !== null) {
+                    /** @var FileManagerInterface $fileManager */
+                    $fileManager = service('file_manager');
+                    $transcriptJsonString = (string) $fileManager->getFileContents(
+                        $this->episode->transcript->json_key,
+                    );
+                    $data['captions'] = json_decode($transcriptJsonString, true);
+                }
+            }
+            $secondsToNextUnpublishedEpisode = (new EpisodeModel())->getSecondsToNextUnpublishedEpisode(
+                $this->podcast->id,
+            );
+            if (auth()->loggedIn()) {
+                helper('form');
+                return view('episode/transcript', $data);
+            }
+            // The page cache is set to a decade so it is deleted manually upon podcast update
+            return view('episode/transcript', $data, [
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
                'cache_name' => $cacheName,
            ]);
        }
@@ -232,12 +274,9 @@ class EpisodeController extends BaseController
    {
        header('Content-Security-Policy: frame-ancestors http://*:* https://*:*');
-        // Prevent analytics hit when authenticated
+        $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        if (! auth()->loggedIn()) {
-            $this->registerPodcastWebpageHit($this->episode->podcast_id);
-        }
-        $session = Services::session();
+        $session = service('session');
        if (service('superglobals')->server('HTTP_REFERER') !== null) {
            $session->set('embed_domain', parse_url(service('superglobals')->server('HTTP_REFERER'), PHP_URL_HOST));
@@ -273,9 +312,7 @@ class EpisodeController extends BaseController
            // The page cache is set to a decade so it is deleted manually upon podcast update
            return view('embed', $data, [
-                'cache' => $secondsToNextUnpublishedEpisode
+                'cache'      => $secondsToNextUnpublishedEpisode ?: DECADE,
-                    ? $secondsToNextUnpublishedEpisode
-                    : DECADE,
                'cache_name' => $cacheName,
            ]);
        }
@@ -295,15 +332,15 @@ class EpisodeController extends BaseController
            'author_url'    => $this->podcast->link,
            'html'          => '<iframe src="' .
                $this->episode->embed_url .
-                '" width="100%" height="' . config(Embed::class)->height . '" frameborder="0" scrolling="no"></iframe>',
+                '" width="100%" height="' . config('Embed')->height . '" frameborder="0" scrolling="no"></iframe>',
-            'width' => config(Embed::class)
+            'width' => config('Embed')
                ->width,
-            'height' => config(Embed::class)
+            'height' => config('Embed')
                ->height,
            'thumbnail_url'   => $this->episode->cover->og_url,
-            'thumbnail_width' => config(Images::class)
+            'thumbnail_width' => config('Images')
                ->podcastCoverSizes['og']['width'],
-            'thumbnail_height' => config(Images::class)
+            'thumbnail_height' => config('Images')
                ->podcastCoverSizes['og']['height'],
        ]);
    }
@@ -320,26 +357,26 @@ class EpisodeController extends BaseController
        $oembed->addChild('author_name', $this->podcast->title);
        $oembed->addChild('author_url', $this->podcast->link);
        $oembed->addChild('thumbnail', $this->episode->cover->og_url);
-        $oembed->addChild('thumbnail_width', (string) config(Images::class)->podcastCoverSizes['og']['width']);
+        $oembed->addChild('thumbnail_width', (string) config('Images')->podcastCoverSizes['og']['width']);
-        $oembed->addChild('thumbnail_height', (string) config(Images::class)->podcastCoverSizes['og']['height']);
+        $oembed->addChild('thumbnail_height', (string) config('Images')->podcastCoverSizes['og']['height']);
        $oembed->addChild(
            'html',
            htmlspecialchars(
                '<iframe src="' .
                    $this->episode->embed_url .
                    '" width="100%" height="' . config(
-                        Embed::class
+                        Embed::class,
                    )->height . '" frameborder="0" scrolling="no"></iframe>',
            ),
        );
-        $oembed->addChild('width', (string) config(Embed::class)->width);
+        $oembed->addChild('width', (string) config('Embed')->width);
-        $oembed->addChild('height', (string) config(Embed::class)->height);
+        $oembed->addChild('height', (string) config('Embed')->height);
        // @phpstan-ignore-next-line
        return $this->response->setXML($oembed);
    }
-    public function episodeObject(): Response
+    public function episodeObject(): ResponseInterface
    {
        $podcastObject = new PodcastEpisode($this->episode);
@@ -348,17 +385,15 @@ class EpisodeController extends BaseController
            ->setBody($podcastObject->toJSON());
    }
-    public function comments(): Response
+    public function comments(): ResponseInterface
    {
        /**
         * get comments: aggregated replies from posts referring to the episode
         */
-        $episodeComments = model(PostModel::class)
+        $episodeComments = model('PostModel')
-            ->whereIn('in_reply_to_id', function (BaseBuilder $builder): BaseBuilder {
+            ->whereIn('in_reply_to_id', fn (BaseBuilder $builder): BaseBuilder => $builder->select('id')
-                return $builder->select('id')
+                ->from('fediverse_posts')
-                    ->from('fediverse_posts')
+                ->where('episode_id', $this->episode->id))
-                    ->where('episode_id', $this->episode->id);
-            })
            ->where('`published_at` <= UTC_TIMESTAMP()', null, false)
            ->orderBy('published_at', 'ASC');
No results found