app/Config/Autoload.php

@@ -16,6 +16,8 @@ use CodeIgniter\Config\AutoloadConfig;
  *
  * NOTE: If you use an identical key in $psr4 or $classmap, then
  * the values in this file will overwrite the framework's values.
+ *
+ * @immutable
  */
 class Autoload extends AutoloadConfig
 {
@@ -27,30 +29,39 @@ class Autoload extends AutoloadConfig
      * their location on the file system. These are used by the autoloader
      * to locate files the first time they have been instantiated.
      *
-     * The '/app' and '/system' directories are already mapped for you.
-     * you may change the name of the 'App' namespace if you wish,
+     * The 'Config' (APPPATH . 'Config') and 'CodeIgniter' (SYSTEMPATH) are
+     * already mapped for you.
+     *
+     * You may change the name of the 'App' namespace if you wish,
      * but this should be done prior to creating any namespaced classes,
      * else you will need to modify all of those classes for this to work.
      *
-     * Prototype:
-     *
-     *   $psr4 = [
-     *       'CodeIgniter' => SYSTEMPATH,
-     *       'App'	       => APPPATH
-     *   ];
-     *
-     * @var array<string, string>
+     * @var array<string, list<string>|string>
      */
     public $psr4 = [
-        APP_NAMESPACE => APPPATH,
-        'Config' => APPPATH . 'Config',
-        'ActivityPub' => APPPATH . 'Libraries/ActivityPub',
-        'Analytics' => APPPATH . 'Libraries/Analytics',
+        APP_NAMESPACE             => APPPATH,
+        'Modules'                 => ROOTPATH . 'modules/',
+        'Modules\Admin'           => ROOTPATH . 'modules/Admin/',
+        'Modules\Analytics'       => ROOTPATH . 'modules/Analytics/',
+        'Modules\Api\Rest\V1'     => ROOTPATH . 'modules/Api/Rest/V1',
+        'Modules\Auth'            => ROOTPATH . 'modules/Auth/',
+        'Modules\Fediverse'       => ROOTPATH . 'modules/Fediverse/',
+        'Modules\Install'         => ROOTPATH . 'modules/Install/',
+        'Modules\Media'           => ROOTPATH . 'modules/Media/',
+        'Modules\MediaClipper'    => ROOTPATH . 'modules/MediaClipper/',
+        'Modules\Platforms'       => ROOTPATH . 'modules/Platforms/',
+        'Modules\Plugins'         => ROOTPATH . 'modules/Plugins/',
+        'Modules\PodcastImport'   => ROOTPATH . 'modules/PodcastImport/',
+        'Modules\PremiumPodcasts' => ROOTPATH . 'modules/PremiumPodcasts/',
+        'Modules\Update'          => ROOTPATH . 'modules/Update/',
+        'Modules\WebSub'          => ROOTPATH . 'modules/WebSub/',
+        'Themes'                  => ROOTPATH . 'themes',
+        'ViewComponents'          => APPPATH . 'Libraries/ViewComponents/',
+        'ViewThemes'              => APPPATH . 'Libraries/ViewThemes/',
     ];
 
     /**
      * -------------------------------------------------------------------
-     * Class Map
      * -------------------------------------------------------------------
      * The class map provides a map of class names and their exact
      * location on the drive. Classes loaded in this manner will have
@@ -77,12 +88,25 @@ class Autoload extends AutoloadConfig
      * or for loading functions.
      *
      * Prototype:
-     * ```
+     *
      *	  $files = [
      *	 	   '/path/to/my/file.php',
      *    ];
-     * ```
-     * @var array<int, string>
+     *
+     * @var list<string>
      */
     public $files = [];
+
+    /**
+     * -------------------------------------------------------------------
+     * Helpers
+     * -------------------------------------------------------------------
+     * Prototype:
+     *   $helpers = [
+     *       'form',
+     *   ];
+     *
+     * @var list<string>
+     */
+    public $helpers = ['auth', 'setting', 'plugins'];
 }

app/Config/Boot/development.php

@@ -9,8 +9,10 @@ declare(strict_types=1);
  * In development, we want to show as many errors as possible to help
  * make sure they don't make it to production. And save us hours of
  * painful debugging.
+ *
+ * If you set 'display_errors' to '1', CI4's detailed error report will show.
  */
-error_reporting(-1);
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /**

app/Config/Boot/production.php

@@ -8,9 +8,13 @@ declare(strict_types=1);
  * --------------------------------------------------------------------------
  * Don't show ANY in production environments. Instead, let the system catch
  * it and display a generic error message.
+ *
+ * If you set 'display_errors' to '1', CI4's detailed error report will show.
  */
+error_reporting(E_ALL & ~E_DEPRECATED);
+// If you want to suppress more types of errors.
+// error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 ini_set('display_errors', '0');
-error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
 
 /**
  * --------------------------------------------------------------------------

app/Config/Boot/testing.php

@@ -2,6 +2,12 @@
 
 declare(strict_types=1);
 
+/*
+ * The environment testing is reserved for PHPUnit testing. It has special
+ * conditions built into the framework at various places to assist with that.
+ * You can’t use it for your development.
+ */
+
 /**
  * --------------------------------------------------------------------------
  * ERROR DISPLAY
@@ -10,7 +16,7 @@ declare(strict_types=1);
  * make sure they don't make it to production. And save us hours of
  * painful debugging.
  */
-error_reporting(-1);
+error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /**

app/Config/CURLRequest.php

+<?php
+
+declare(strict_types=1);
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class CURLRequest extends BaseConfig
+{
+    /**
+     * --------------------------------------------------------------------------
+     * CURLRequest Share Options
+     * --------------------------------------------------------------------------
+     *
+     * Whether share options between requests or not.
+     *
+     * If true, all the options won't be reset between requests.
+     * It may cause an error request with unnecessary headers.
+     */
+    public bool $shareOptions = false;
+}

app/Config/Cache.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace Config;
 
+use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Cache\Handlers\DummyHandler;
 use CodeIgniter\Cache\Handlers\FileHandler;
 use CodeIgniter\Cache\Handlers\MemcachedHandler;
@@ -35,37 +36,6 @@ class Cache extends BaseConfig
      */
     public string $backupHandler = 'dummy';
 
-    /**
-     * --------------------------------------------------------------------------
-     * Cache Directory Path
-     * --------------------------------------------------------------------------
-     *
-     * The path to where cache files should be stored, if using a file-based
-     * system.
-     *
-     * @deprecated Use the driver-specific variant under $file
-     */
-    public string $storePath = WRITEPATH . 'cache/';
-
-    /**
-     * --------------------------------------------------------------------------
-     * Cache Include Query String
-     * --------------------------------------------------------------------------
-     *
-     * Whether to take the URL query string into consideration when generating
-     * output cache files. Valid options are:
-     *
-     *    false      = Disabled
-     *    true       = Enabled, take all query parameters into account.
-     *                 Please be aware that this may result in numerous cache
-     *                 files generated for the same page over and over again.
-     *    array('q') = Enabled, but only take into account the specified list
-     *                 of query parameters.
-     *
-     * @var boolean|string[]
-     */
-    public bool | array $cacheQueryString = false;
-
     /**
      * --------------------------------------------------------------------------
      * Key Prefix
@@ -89,10 +59,24 @@ class Cache extends BaseConfig
      */
     public int $ttl = 60;
 
+    /**
+     * --------------------------------------------------------------------------
+     * Reserved Characters
+     * --------------------------------------------------------------------------
+     *
+     * A string of reserved characters that will not be allowed in keys or tags.
+     * Strings that violate this restriction will cause handlers to throw.
+     * Default: {}()/\@:
+     *
+     * Note: The default set is required for PSR-6 compliance.
+     */
+    public string $reservedCharacters = '{}()/\@:';
+
     /**
      * --------------------------------------------------------------------------
      * File settings
      * --------------------------------------------------------------------------
+     *
      * Your file storage preferences can be specified below, if you are using
      * the File driver.
      *
@@ -100,25 +84,26 @@ class Cache extends BaseConfig
      */
     public array $file = [
         'storePath' => WRITEPATH . 'cache/',
-        'mode' => 0640,
+        'mode'      => 0640,
     ];
 
     /**
      * -------------------------------------------------------------------------
      * Memcached settings
      * -------------------------------------------------------------------------
+     *
      * Your Memcached servers can be specified below, if you are using
      * the Memcached drivers.
      *
      * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
      *
-     * @var array<string, string|int|boolean>
+     * @var array<string, string|int|bool>
      */
     public array $memcached = [
-        'host' => '127.0.0.1',
-        'port' => 11211,
+        'host'   => '127.0.0.1',
+        'port'   => 11211,
         'weight' => 1,
-        'raw' => false,
+        'raw'    => false,
     ];
 
     /**
@@ -131,10 +116,10 @@ class Cache extends BaseConfig
      * @var array<string, string|int|null>
      */
     public array $redis = [
-        'host' => '127.0.0.1',
+        'host'     => '127.0.0.1',
         'password' => null,
-        'port' => 6379,
-        'timeout' => 0,
+        'port'     => 6379,
+        'timeout'  => 0,
         'database' => 0,
     ];
 
@@ -146,14 +131,33 @@ class Cache extends BaseConfig
      * This is an array of cache engine alias' and class names. Only engines
      * that are listed here are allowed to be used.
      *
-     * @var array<string, string>
+     * @var array<string, class-string<CacheInterface>>
      */
     public array $validHandlers = [
-        'dummy' => DummyHandler::class,
-        'file' => FileHandler::class,
+        'dummy'     => DummyHandler::class,
+        'file'      => FileHandler::class,
         'memcached' => MemcachedHandler::class,
-        'predis' => PredisHandler::class,
-        'redis' => RedisHandler::class,
-        'wincache' => WincacheHandler::class,
+        'predis'    => PredisHandler::class,
+        'redis'     => RedisHandler::class,
+        'wincache'  => WincacheHandler::class,
     ];
+
+    /**
+     * --------------------------------------------------------------------------
+     * Web Page Caching: Cache Include Query String
+     * --------------------------------------------------------------------------
+     *
+     * Whether to take the URL query string into consideration when generating
+     * output cache files. Valid options are:
+     *
+     *    false = Disabled
+     *    true  = Enabled, take all query parameters into account.
+     *            Please be aware that this may result in numerous cache
+     *            files generated for the same page over and over again.
+     *    ['q'] = Enabled, but only take into account the specified list
+     *            of query parameters.
+     *
+     * @var bool|list<string>
+     */
+    public $cacheQueryString = false;
 }

app/Config/Colors.php

+<?php
+
+declare(strict_types=1);
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Colors extends BaseConfig
+{
+    /**
+     * @var array<string, array<string, mixed>>
+     */
+    public array $themes = [
+        /* Castopod's brand color */
+        'pine' => [
+            'accent-base'     => [174, 100, 29],
+            'accent-hover'    => [172, 100, 17],
+            'accent-muted'    => [131, 100, 12],
+            'accent-contrast' => [0, 0, 100],
+
+            'heading-foreground' => [172, 100, 17],
+            'heading-background' => [111, 64, 94],
+
+            'background-elevated'   => [0, 0, 100],
+            'background-base'       => [173, 44, 96],
+            'background-navigation' => [172, 100, 17],
+            'background-header'     => [172, 100, 17],
+            'background-highlight'  => [111, 64, 94],
+            'background-backdrop'   => [0, 0, 50],
+
+            'border-subtle'     => [111, 42, 86],
+            'border-contrast'   => [0, 0, 0],
+            'border-navigation' => [131, 100, 12],
+
+            'text-base'  => [158, 8, 3],
+            'text-muted' => [172, 8, 38],
+        ],
+        /* Red / Rose color */
+        'crimson' => [
+            'accent-base'     => [350, 87, 61],
+            'accent-hover'    => [348, 75, 40],
+            'accent-muted'    => [348, 73, 32],
+            'accent-contrast' => [0, 0, 100],
+
+            'heading-foreground' => [348, 73, 32],
+            'heading-background' => [344, 79, 96],
+
+            'background-elevated'  => [0, 0, 100],
+            'background-base'      => [350, 44, 96],
+            'background-header'    => [348, 75, 40],
+            'background-highlight' => [344, 79, 96],
+            'background-backdrop'  => [0, 0, 50],
+
+            'border-subtle'   => [348, 42, 86],
+            'border-contrast' => [0, 0, 0],
+
+            'text-base'  => [340, 8, 3],
+            'text-muted' => [345, 8, 38],
+        ],
+        /* Blue color */
+        'lake' => [
+            'accent-base'     => [194, 100, 44],
+            'accent-hover'    => [194, 100, 22],
+            'accent-muted'    => [195, 100, 11],
+            'accent-contrast' => [0, 0, 100],
+
+            'heading-foreground' => [194, 100, 22],
+            'heading-background' => [195, 100, 92],
+
+            'background-elevated'  => [0, 0, 100],
+            'background-base'      => [196, 44, 96],
+            'background-header'    => [194, 100, 22],
+            'background-highlight' => [195, 100, 92],
+            'background-backdrop'  => [0, 0, 50],
+
+            'border-subtle'   => [195, 42, 86],
+            'border-contrast' => [0, 0, 0],
+
+            'text-base'  => [194, 8, 3],
+            'text-muted' => [195, 8, 38],
+        ],
+        /* Orange color */
+        'amber' => [
+            'accent-base'     => [17, 100, 57],
+            'accent-hover'    => [17, 100, 35],
+            'accent-muted'    => [17, 100, 24],
+            'accent-contrast' => [0, 0, 100],
+
+            'heading-foreground' => [17, 100, 35],
+            'heading-background' => [17, 100, 89],
+
+            'background-elevated'  => [0, 0, 100],
+            'background-base'      => [15, 44, 96],
+            'background-header'    => [17, 100, 35],
+            'background-highlight' => [17, 100, 89],
+            'background-backdrop'  => [0, 0, 50],
+
+            'border-subtle'   => [17, 42, 86],
+            'border-contrast' => [0, 0, 0],
+
+            'text-base'  => [15, 8, 3],
+            'text-muted' => [17, 8, 38],
+        ],
+        /* Violet color */
+        'jacaranda' => [
+            'accent-base'     => [254, 72, 52],
+            'accent-hover'    => [254, 73, 30],
+            'accent-muted'    => [254, 71, 19],
+            'accent-contrast' => [0, 0, 100],
+
+            'heading-foreground' => [254, 73, 30],
+            'heading-background' => [254, 73, 84],
+
+            'background-elevated'  => [0, 0, 100],
+            'background-base'      => [253, 44, 96],
+            'background-header'    => [254, 73, 30],
+            'background-highlight' => [254, 88, 91],
+            'background-backdrop'  => [0, 0, 50],
+
+            'border-subtle'   => [254, 42, 86],
+            'border-contrast' => [0, 0, 0],
+
+            'text-base'  => [253, 8, 3],
+            'text-muted' => [254, 8, 38],
+        ],
+        /* Black color */
+        'onyx' => [
+            'accent-base'     => [240, 17, 2],
+            'accent-hover'    => [240, 17, 17],
+            'accent-muted'    => [240, 17, 17],
+            'accent-contrast' => [0, 0, 100],
+
+            'heading-foreground' => [240, 17, 17],
+            'heading-background' => [240, 17, 94],
+
+            'background-elevated'  => [0, 0, 100],
+            'background-base'      => [240, 17, 96],
+            'background-header'    => [240, 12, 17],
+            'background-highlight' => [240, 17, 94],
+            'background-backdrop'  => [0, 0, 50],
+
+            'border-subtle'   => [240, 17, 86],
+            'border-contrast' => [0, 0, 0],
+
+            'text-base'  => [240, 8, 3],
+            'text-muted' => [240, 8, 38],
+        ],
+    ];
+}

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.0.0-alpha.57');
+defined('CP_VERSION') || define('CP_VERSION', '2.0.0-next.3');
 
 /*
  | --------------------------------------------------------------------
@@ -24,10 +24,23 @@ defined('CP_VERSION') || define('CP_VERSION', '1.0.0-alpha.57');
  | classes should use.
  |
  | NOTE: changing this will require manually modifying the
- | existing namespaces of App\* namespaced-classes.
+ | existing namespaces of App* namespaced-classes.
  */
 defined('APP_NAMESPACE') || define('APP_NAMESPACE', 'App');
 
+/*
+ | --------------------------------------------------------------------
+ | Plugins Path
+ | --------------------------------------------------------------------
+ |
+ | This defines the folder in which plugins will live.
+ */
+defined('PLUGINS_PATH') ||
+    define('PLUGINS_PATH', ROOTPATH . 'plugins' . DIRECTORY_SEPARATOR);
+
+defined('PLUGINS_KEY_PATTERN') ||
+    define('PLUGINS_KEY_PATTERN', '[a-z0-9]([_.-]?[a-z0-9]+)*\/[a-z0-9]([_.-]?[a-z0-9]+)*');
+
 /*
  | --------------------------------------------------------------------------
  | Composer Path
@@ -52,9 +65,9 @@ defined('MINUTE') || define('MINUTE', 60);
 defined('HOUR') || define('HOUR', 3600);
 defined('DAY') || define('DAY', 86400);
 defined('WEEK') || define('WEEK', 604800);
-defined('MONTH') || define('MONTH', 2592000);
-defined('YEAR') || define('YEAR', 31536000);
-defined('DECADE') || define('DECADE', 315360000);
+defined('MONTH') || define('MONTH', 2_592_000);
+defined('YEAR') || define('YEAR', 31_536_000);
+defined('DECADE') || define('DECADE', 315_360_000);
 
 /*
  | --------------------------------------------------------------------------

app/Config/ContentSecurityPolicy.php

@@ -35,28 +35,28 @@ class ContentSecurityPolicy extends BaseConfig
     /**
      * Will default to self if not overridden
      *
-     * @var string|string[]|null
+     * @var list<string>|string|null
      */
     public string | array | null $defaultSrc = null;
 
     /**
      * Lists allowed scripts' URLs.
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $scriptSrc = 'self';
 
     /**
      * Lists allowed stylesheets' URLs.
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $styleSrc = 'self';
 
     /**
      * Defines the origins from which images can be loaded.
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $imageSrc = 'self';
 
@@ -65,35 +65,35 @@ class ContentSecurityPolicy extends BaseConfig
      *
      * Will default to self if not overridden
      *
-     * @var string|string[]|null
+     * @var list<string>|string|null
      */
     public string | array | null $baseURI = null;
 
     /**
      * Lists the URLs for workers and embedded frame contents
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $childSrc = 'self';
 
     /**
      * Limits the origins that you can connect to (via XHR, WebSockets, and EventSource).
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $connectSrc = 'self';
 
     /**
      * Specifies the origins that can serve web fonts.
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $fontSrc;
 
     /**
      * Lists valid endpoints for submission from `<form>` tags.
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $formAction = 'self';
 
@@ -102,47 +102,62 @@ class ContentSecurityPolicy extends BaseConfig
      * `<embed>`, and `<applet>` tags. This directive can't be used in `<meta>` tags and applies only to non-HTML
      * resources.
      *
-     * @var string|string[]|null
+     * @var list<string>|string|null
      */
     public string | array | null $frameAncestors = null;
 
     /**
      * The frame-src directive restricts the URLs which may be loaded into nested browsing contexts.
      *
-     * @var string[]|string|null
+     * @var list<string>|string|null
      */
     public string | array | null $frameSrc = null;
 
     /**
      * Restricts the origins allowed to deliver video and audio.
      *
-     * @var string|string[]|null
+     * @var list<string>|string|null
      */
     public string | array | null $mediaSrc = null;
 
     /**
      * Allows control over Flash and other plugins.
      *
-     * @var string|string[]
+     * @var list<string>|string
      */
     public string | array $objectSrc = 'self';
 
     /**
-     * @var string|string[]|null
+     * @var list<string>|string|null
      */
     public string | array | null $manifestSrc = null;
 
     /**
      * Limits the kinds of plugins a page may invoke.
      *
-     * @var string|string[]|null
+     * @var list<string>|string|null
      */
     public string | array | null $pluginTypes = null;
 
     /**
      * List of actions allowed.
      *
-     * @var string|string[]|null
+     * @var list<string>|string|null
      */
     public string | array | null $sandbox = null;
+
+    /**
+     * Nonce tag for style
+     */
+    public string $styleNonceTag = '{csp-style-nonce}';
+
+    /**
+     * Nonce tag for script
+     */
+    public string $scriptNonceTag = '{csp-script-nonce}';
+
+    /**
+     * Replace nonce tag automatically
+     */
+    public bool $autoNonce = true;
 }

app/Config/Cookie.php

@@ -84,6 +84,8 @@ class Cookie extends BaseConfig
      * Defaults to `Lax` for compatibility with modern browsers. Setting `''`
      * (empty string) means default SameSite attribute set by browsers (`Lax`)
      * will be set on cookies. If set to `None`, `$secure` must also be set.
+     *
+     * @phpstan-var 'None'|'Lax'|'Strict'|''
      */
     public string $samesite = 'Lax';
 

app/Config/Cors.php

+<?php
+
+declare(strict_types=1);
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Cross-Origin Resource Sharing (CORS) Configuration
+ *
+ * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
+ */
+class Cors extends BaseConfig
+{
+    /**
+     * The default CORS configuration.
+     *
+     * @var array{
+     *      allowedOrigins: list<string>,
+     *      allowedOriginsPatterns: list<string>,
+     *      supportsCredentials: bool,
+     *      allowedHeaders: list<string>,
+     *      exposedHeaders: list<string>,
+     *      allowedMethods: list<string>,
+     *      maxAge: int,
+     *  }
+     */
+    public array $default = [
+        /**
+         * Origins for the `Access-Control-Allow-Origin` header.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
+         *
+         * E.g.:
+         *   - ['http://localhost:8080']
+         *   - ['https://www.example.com']
+         */
+        'allowedOrigins' => [],
+
+        /**
+         * Origin regex patterns for the `Access-Control-Allow-Origin` header.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin
+         *
+         * NOTE: A pattern specified here is part of a regular expression. It will
+         *       be actually `#\A<pattern>\z#`.
+         *
+         * E.g.:
+         *   - ['https://\w+\.example\.com']
+         */
+        'allowedOriginsPatterns' => [],
+
+        /**
+         * Weather to send the `Access-Control-Allow-Credentials` header.
+         *
+         * The Access-Control-Allow-Credentials response header tells browsers whether
+         * the server allows cross-origin HTTP requests to include credentials.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Credentials
+         */
+        'supportsCredentials' => false,
+
+        /**
+         * Set headers to allow.
+         *
+         * The Access-Control-Allow-Headers response header is used in response to
+         * a preflight request which includes the Access-Control-Request-Headers to
+         * indicate which HTTP headers can be used during the actual request.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Headers
+         */
+        'allowedHeaders' => [],
+
+        /**
+         * Set headers to expose.
+         *
+         * The Access-Control-Expose-Headers response header allows a server to
+         * indicate which response headers should be made available to scripts running
+         * in the browser, in response to a cross-origin request.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Expose-Headers
+         */
+        'exposedHeaders' => [],
+
+        /**
+         * Set methods to allow.
+         *
+         * The Access-Control-Allow-Methods response header specifies one or more
+         * methods allowed when accessing a resource in response to a preflight
+         * request.
+         *
+         * E.g.:
+         *   - ['GET', 'POST', 'PUT', 'DELETE']
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Methods
+         */
+        'allowedMethods' => [],
+
+        /**
+         * Set how many seconds the results of a preflight request can be cached.
+         *
+         * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Max-Age
+         */
+        'maxAge' => 7200,
+    ];
+}

app/Config/Database.php

@@ -24,53 +24,66 @@ class Database extends Config
     /**
      * The default database connection.
      *
-     * @var array<string, string|bool|int|array>
+     * @var array<string, mixed>
      */
     public array $default = [
-        'DSN' => '',
-        'hostname' => 'localhost',
-        'username' => '',
-        'password' => '',
-        'database' => '',
-        'DBDriver' => 'MySQLi',
-        'DBPrefix' => 'cp_',
-        'pConnect' => false,
-        'DBDebug' => ENVIRONMENT !== 'production',
-        'charset' => 'utf8mb4',
-        'DBCollat' => 'utf8mb4_unicode_ci',
-        'swapPre' => '',
-        'encrypt' => false,
-        'compress' => false,
-        'strictOn' => false,
-        'failover' => [],
-        'port' => 3306,
+        'DSN'          => '',
+        'hostname'     => 'localhost',
+        'username'     => '',
+        'password'     => '',
+        'database'     => '',
+        'DBDriver'     => 'MySQLi',
+        'DBPrefix'     => 'cp_',
+        'pConnect'     => false,
+        'DBDebug'      => true,
+        'charset'      => 'utf8mb4',
+        'DBCollat'     => 'utf8mb4_unicode_ci',
+        'swapPre'      => '',
+        'encrypt'      => false,
+        'compress'     => false,
+        'strictOn'     => false,
+        'failover'     => [],
+        'port'         => 3306,
+        'numberNative' => false,
+        'foundRows'    => false,
+        'dateFormat'   => [
+            'date'     => 'Y-m-d',
+            'datetime' => 'Y-m-d H:i:s',
+            'time'     => 'H:i:s',
+        ],
     ];
 
     /**
      * This database connection is used when running PHPUnit database tests.
      *
-     * @noRector StringClassNameToClassConstantRector
-     *
-     * @var array<string, string|bool|int|array>
+     * @var array<string, mixed>
      */
     public array $tests = [
-        'DSN' => '',
+        'DSN'      => '',
         'hostname' => '127.0.0.1',
         'username' => '',
         'password' => '',
         'database' => ':memory:',
         'DBDriver' => 'SQLite3',
         'DBPrefix' => 'db_',
-        'pConnect' => false,
-        'DBDebug' => ENVIRONMENT !== 'production',
-        'charset' => 'utf8',
-        'DBCollat' => 'utf8_general_ci',
-        'swapPre' => '',
-        'encrypt' => false,
-        'compress' => false,
-        'strictOn' => false,
-        'failover' => [],
-        'port' => 3306,
+        // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
+        'pConnect'    => false,
+        'DBDebug'     => true,
+        'charset'     => 'utf8',
+        'DBCollat'    => '',
+        'swapPre'     => '',
+        'encrypt'     => false,
+        'compress'    => false,
+        'strictOn'    => false,
+        'failover'    => [],
+        'port'        => 3306,
+        'foreignKeys' => true,
+        'busyTimeout' => 1000,
+        'dateFormat'  => [
+            'date'     => 'Y-m-d',
+            'datetime' => 'Y-m-d H:i:s',
+            'time'     => 'H:i:s',
+        ],
     ];
 
     //--------------------------------------------------------------------

app/Config/DocTypes.php

@@ -4,6 +4,9 @@ declare(strict_types=1);
 
 namespace Config;
 
+/**
+ * @immutable
+ */
 class DocTypes
 {
     /**
@@ -12,42 +15,34 @@ class DocTypes
      * @var array<string, string>
      */
     public array $list = [
-        'xhtml11' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
-        'xhtml1-strict' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-        'xhtml1-trans' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-        'xhtml1-frame' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
-        'xhtml-basic11' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
-        'html5' => '<!DOCTYPE html>',
-        'html4-strict' =>
-            '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
-        'html4-trans' =>
-            '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
-        'html4-frame' =>
-            '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
-        'mathml1' =>
-            '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
-        'mathml2' =>
-            '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
-        'svg10' =>
-            '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
-        'svg11' =>
-            '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
-        'svg11-basic' =>
-            '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
-        'svg11-tiny' =>
-            '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
-        'xhtml-math-svg-xh' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
-        'xhtml-math-svg-sh' =>
-            '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
-        'xhtml-rdfa-1' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
-        'xhtml-rdfa-2' =>
-            '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
+        'xhtml11'           => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">',
+        'xhtml1-strict'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+        'xhtml1-trans'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+        'xhtml1-frame'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+        'xhtml-basic11'     => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">',
+        'html5'             => '<!DOCTYPE html>',
+        'html4-strict'      => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+        'html4-trans'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+        'html4-frame'       => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+        'mathml1'           => '<!DOCTYPE math SYSTEM "http://www.w3.org/Math/DTD/mathml1/mathml.dtd">',
+        'mathml2'           => '<!DOCTYPE math PUBLIC "-//W3C//DTD MathML 2.0//EN" "http://www.w3.org/Math/DTD/mathml2/mathml2.dtd">',
+        'svg10'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">',
+        'svg11'             => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">',
+        'svg11-basic'       => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">',
+        'svg11-tiny'        => '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">',
+        'xhtml-math-svg-xh' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+        'xhtml-math-svg-sh' => '<!DOCTYPE svg:svg PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">',
+        'xhtml-rdfa-1'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">',
+        'xhtml-rdfa-2'      => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-2.dtd">',
     ];
+
+    /**
+     * Whether to remove the solidus (`/`) character for void HTML elements (e.g. `<input>`)
+     * for HTML5 compatibility.
+     *
+     * Set to:
+     *    `true` - to be HTML5 compatible
+     *    `false` - to be XHTML compatible
+     */
+    public bool $html5 = true;
 }

app/Config/Email.php

@@ -8,21 +8,21 @@ use CodeIgniter\Config\BaseConfig;
 
 class Email extends BaseConfig
 {
-    public string $fromEmail;
+    public string $fromEmail = '';
 
-    public string $fromName;
+    public string $fromName = 'Castopod';
 
-    public string $recipients;
+    public string $recipients = '';
 
     /**
      * The "user agent"
      */
-    public string $userAgent = 'CodeIgniter';
+    public string $userAgent = 'Castopod/' . CP_VERSION;
 
     /**
      * The mail sending protocol: mail, sendmail, smtp
      */
-    public string $protocol = 'mail';
+    public string $protocol = 'smtp';
 
     /**
      * The server path to Sendmail.
@@ -30,19 +30,19 @@ class Email extends BaseConfig
     public string $mailPath = '/usr/sbin/sendmail';
 
     /**
-     * SMTP Server Address
+     * SMTP Server Hostname
      */
-    public string $SMTPHost;
+    public string $SMTPHost = '';
 
     /**
      * SMTP Username
      */
-    public string $SMTPUser;
+    public string $SMTPUser = '';
 
     /**
      * SMTP Password
      */
-    public string $SMTPPass;
+    public string $SMTPPass = '';
 
     /**
      * SMTP Port
@@ -60,7 +60,11 @@ class Email extends BaseConfig
     public bool $SMTPKeepAlive = false;
 
     /**
-     * SMTP Encryption. Either tls or ssl
+     * SMTP Encryption.
+     *
+     * @var string '', 'tls' or 'ssl'. 'tls' will issue a STARTTLS command
+     *             to the server. 'ssl' means implicit SSL. Connection on port
+     *             465 should set this to ''.
      */
     public string $SMTPCrypto = 'tls';
 
@@ -77,7 +81,7 @@ class Email extends BaseConfig
     /**
      * Type of mail, either 'text' or 'html'
      */
-    public string $mailType = 'text';
+    public string $mailType = 'html';
 
     /**
      * Character set (utf-8, iso-8859-1, etc.)
@@ -118,4 +122,11 @@ class Email extends BaseConfig
      * Enable notify message from server
      */
     public bool $DSN = false;
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->userAgent = 'Castopod/' . CP_VERSION . '; +' . base_url('', 'https');
+    }
 }

app/Config/Embed.php

+<?php
+
+declare(strict_types=1);
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class Embed extends BaseConfig
+{
+    /**
+     * --------------------------------------------------------------------------
+     * Embeddable player config
+     * --------------------------------------------------------------------------
+     */
+    public int $width = 485;
+
+    public int $height = 112;
+}

app/Config/Encryption.php

@@ -58,4 +58,37 @@ class Encryption extends BaseConfig
      * HMAC digest to use, e.g. 'SHA512' or 'SHA256'. Default value is 'SHA512'.
      */
     public string $digest = 'SHA512';
+
+    /**
+     * Whether the cipher-text should be raw. If set to false, then it will be base64 encoded.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to false for CI3 Encryption compatibility.
+     */
+    public bool $rawData = true;
+
+    /**
+     * Encryption key info.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to 'encryption' for CI3 Encryption compatibility.
+     */
+    public string $encryptKeyInfo = '';
+
+    /**
+     * Authentication key info.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to 'authentication' for CI3 Encryption compatibility.
+     */
+    public string $authKeyInfo = '';
+
+    /**
+     * Cipher to use.
+     * This setting is only used by OpenSSLHandler.
+     *
+     * Set to 'AES-128-CBC' to decrypt encrypted data that encrypted
+     * by CI3 Encryption default configuration.
+     */
+    public string $cipher = 'AES-256-CTR';
 }

app/Config/Events.php

@@ -5,10 +5,12 @@ declare(strict_types=1);
 namespace Config;
 
 use App\Entities\Actor;
-use App\Entities\Note;
-use App\Entities\User;
+use App\Entities\Post;
+use App\Models\EpisodeModel;
+use CodeIgniter\Debug\Toolbar\Collectors\Database;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\FrameworkException;
+use CodeIgniter\HotReloader\HotReloader;
 
 /*
  * --------------------------------------------------------------------
@@ -27,8 +29,7 @@ use CodeIgniter\Exceptions\FrameworkException;
  *      Events::on('create', [$myInstance, 'myMethod']);
  */
 
-Events::on('pre_system', function () {
-    // @phpstan-ignore-next-line
+Events::on('pre_system', static function (): void {
     if (ENVIRONMENT !== 'testing') {
         if (ini_get('zlib.output_compression')) {
             throw FrameworkException::forEnabledZlibOutputCompression();
@@ -38,9 +39,7 @@ Events::on('pre_system', function () {
             ob_end_flush();
         }
 
-        ob_start(function ($buffer) {
-            return $buffer;
-        });
+        ob_start(static fn ($buffer) => $buffer);
     }
 
     /*
@@ -48,42 +47,31 @@ Events::on('pre_system', function () {
      * Debug Toolbar Listeners.
      * --------------------------------------------------------------------
      * If you delete, they will no longer be collected.
-     *
-     * @phpstan-ignore-next-line
      */
     if (CI_DEBUG && ! is_cli()) {
-        Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
-        Services::toolbar()->respond();
-    }
-});
-
-Events::on('login', function (User $user): void {
-    helper('auth');
-
-    // set interact_as_actor_id value
-    $userPodcasts = $user->podcasts;
-    if ($userPodcasts = $user->podcasts) {
-        set_interact_as_actor($userPodcasts[0]->actor_id);
+        Events::on('DBQuery', Database::class . '::collect');
+        service('toolbar')
+            ->respond();
+
+        // Hot Reload route - for framework use on the hot reloader.
+        if (ENVIRONMENT === 'development') {
+            service('routes')->get('__hot-reload', static function (): void {
+                (new HotReloader())->run();
+            });
+        }
     }
 });
 
-Events::on('logout', function (User $user): void {
-    helper('auth');
-
-    // remove user's interact_as_actor session
-    remove_interact_as_actor();
-});
-
 /*
  * --------------------------------------------------------------------
- * ActivityPub events
+ * Fediverse events
  * --------------------------------------------------------------------
  */
 /**
  * @param Actor $actor
  * @param Actor $targetActor
  */
-Events::on('on_follow', function ($actor, $targetActor): void {
+Events::on('on_follow', static function ($actor, $targetActor): void {
     if ($actor->is_podcast) {
         cache()
             ->deleteMatching("podcast#{$actor->podcast->id}*");
@@ -103,7 +91,7 @@ Events::on('on_follow', function ($actor, $targetActor): void {
  * @param Actor $actor
  * @param Actor $targetActor
  */
-Events::on('on_undo_follow', function ($actor, $targetActor): void {
+Events::on('on_undo_follow', static function ($actor, $targetActor): void {
     if ($actor->is_podcast) {
         cache()
             ->deleteMatching("podcast#{$actor->podcast->id}*");
@@ -120,82 +108,53 @@ Events::on('on_undo_follow', function ($actor, $targetActor): void {
 });
 
 /**
- * @param Note $note
+ * @param Post $post
  */
-Events::on('on_note_add', function ($note): void {
-    if ($note->is_reply) {
-        $note = $note->reply_to_note;
-    }
-
-    if ($note->episode_id) {
-        model('EpisodeModel')
-            ->where('id', $note->episode_id)
-            ->increment('notes_total');
-    }
-
-    if ($note->actor->is_podcast) {
+Events::on('on_post_add', static function ($post): void {
+    model(EpisodeModel::class, false)->builder()
+        ->where('id', $post->episode_id)
+        ->increment('posts_count');
+    if ($post->actor->is_podcast) {
         // Removing all of the podcast pages is a bit overkill, but works to avoid caching bugs
         // same for other events below
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
     }
 });
 
 /**
- * @param Note $note
+ * @param Post $post
  */
-Events::on('on_note_remove', function ($note): void {
-    if ($note->is_reply) {
-        Events::trigger('on_note_remove', $note->reply_to_note);
-    }
-
-    if ($episodeId = $note->episode_id) {
-        model('EpisodeModel')
-            ->where('id', $episodeId)
-            ->decrement('notes_total', 1 + $note->reblogs_count);
-
-        model('EpisodeModel')
-            ->where('id', $episodeId)
-            ->decrement('reblogs_total', $note->reblogs_count);
-
-        model('EpisodeModel')
+Events::on('on_post_remove', static function ($post): void {
+    if ($episodeId = $post->episode_id) {
+        model(EpisodeModel::class, false)->builder()
             ->where('id', $episodeId)
-            ->decrement('favourites_total', $note->favourites_count);
+            ->decrement('posts_count');
     }
 
-    if ($note->actor->is_podcast) {
+    if ($post->actor->is_podcast) {
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
     }
 
     cache()
-        ->deleteMatching("page_note#{$note->id}*");
+        ->deleteMatching("page_post#{$post->id}*");
 });
 
 /**
  * @param Actor $actor
- * @param Note $note
+ * @param Post $post
  */
-Events::on('on_note_reblog', function ($actor, $note): void {
-    if ($episodeId = $note->episode_id) {
-        model('EpisodeModel')
-            ->where('id', $episodeId)
-            ->increment('reblogs_total');
-
-        model('EpisodeModel')
-            ->where('id', $episodeId)
-            ->increment('notes_total');
-    }
-
-    if ($note->actor->is_podcast) {
+Events::on('on_post_reblog', static function ($actor, $post): void {
+    if ($post->actor->is_podcast) {
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
     }
 
     if ($actor->is_podcast) {
@@ -205,111 +164,106 @@ Events::on('on_note_reblog', function ($actor, $note): void {
     }
 
     cache()
-        ->deleteMatching("page_note#{$note->id}*");
-
-    if ($note->is_reply) {
-        cache()->deleteMatching("page_note#{$note->in_reply_to_id}");
+        ->deleteMatching("page_post#{$post->id}*");
+    if ($post->in_reply_to_id !== null) {
+        cache()->deleteMatching("page_post#{$post->in_reply_to_id}");
     }
 });
 
 /**
- * @param Note $reblogNote
+ * @param Post $reblogPost
  */
-Events::on('on_note_undo_reblog', function ($reblogNote): void {
-    $note = $reblogNote->reblog_of_note;
-    if ($episodeId = $note->episode_id) {
-        model('EpisodeModel')
-            ->where('id', $episodeId)
-            ->decrement('reblogs_total');
-
-        model('EpisodeModel')
-            ->where('id', $episodeId)
-            ->decrement('notes_total');
-    }
-
-    if ($note->actor->is_podcast) {
+Events::on('on_post_undo_reblog', static function ($reblogPost): void {
+    $post = $reblogPost->reblog_of_post;
+    if ($post->actor->is_podcast) {
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
     }
 
     cache()
-        ->deleteMatching("page_note#{$note->id}*");
+        ->deleteMatching("page_post#{$post->id}*");
     cache()
-        ->deleteMatching("page_note#{$reblogNote->id}*");
-
-    if ($note->is_reply) {
-        cache()->deleteMatching("page_note#{$note->in_reply_to_id}");
+        ->deleteMatching("page_post#{$reblogPost->id}*");
+    if ($post->in_reply_to_id !== null) {
+        cache()->deleteMatching("page_post#{$post->in_reply_to_id}");
     }
 
-    if ($reblogNote->actor->is_podcast) {
+    if ($reblogPost->actor->is_podcast) {
         cache()
-            ->deleteMatching("podcast#{$reblogNote->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$reblogPost->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$reblogNote->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$reblogPost->actor->podcast->id}*");
     }
 });
 
 /**
- * @param Note $reply
+ * @param Post $reply
  */
-Events::on('on_note_reply', function ($reply): void {
-    $note = $reply->reply_to_note;
+Events::on('on_post_reply', static function ($reply): void {
+    $post = $reply->reply_to_post;
+    if ($post->in_reply_to_id === null) {
+        model(EpisodeModel::class, false)->builder()
+            ->where('id', $post->episode_id)
+            ->increment('comments_count');
+    }
 
-    if ($note->actor->is_podcast) {
+    if ($post->actor->is_podcast) {
+        cache()
+            ->deleteMatching("podcast-{$post->actor->podcast->handle}*");
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
     }
 
     cache()
-        ->deleteMatching("page_note#{$note->id}*");
+        ->deleteMatching("page_post#{$post->id}*");
 });
 
 /**
- * @param Note $reply
+ * @param Post $reply
  */
-Events::on('on_reply_remove', function ($reply): void {
-    $note = $reply->reply_to_note;
+Events::on('on_reply_remove', static function ($reply): void {
+    $post = $reply->reply_to_post;
+    if ($post->in_reply_to_id === null) {
+        model(EpisodeModel::class, false)->builder()
+            ->where('id', $post->episode_id)
+            ->decrement('comments_count');
+    }
 
-    if ($note->actor->is_podcast) {
+    if ($post->actor->is_podcast) {
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast-{$post->actor->podcast->handle}*");
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
+        cache()
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
     }
 
     cache()
-        ->deleteMatching("page_note#{$note->id}*");
+        ->deleteMatching("page_post#{$post->id}*");
     cache()
-        ->deleteMatching("page_note#{$reply->id}*");
+        ->deleteMatching("page_post#{$reply->id}*");
 });
 
 /**
  * @param Actor $actor
- * @param Note $note
+ * @param Post $post
  */
-Events::on('on_note_favourite', function ($actor, $note): void {
-    if ($note->episode_id) {
-        model('EpisodeModel')
-            ->where('id', $note->episode_id)
-            ->increment('favourites_total');
-    }
-
-    if ($note->actor->is_podcast) {
+Events::on('on_post_favourite', static function ($actor, $post): void {
+    if ($post->actor->is_podcast) {
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
     }
 
     cache()
-        ->deleteMatching("page_note#{$note->id}*");
-
-    if ($note->is_reply) {
-        cache()->deleteMatching("page_note#{$note->in_reply_to_id}*");
+        ->deleteMatching("page_post#{$post->id}*");
+    if ($post->in_reply_to_id !== null) {
+        cache()->deleteMatching("page_post#{$post->in_reply_to_id}*");
     }
 
     if ($actor->is_podcast) {
@@ -321,27 +275,20 @@ Events::on('on_note_favourite', function ($actor, $note): void {
 
 /**
  * @param Actor $actor
- * @param Note $note
+ * @param Post $post
  */
-Events::on('on_note_undo_favourite', function ($actor, $note): void {
-    if ($note->episode_id) {
-        model('EpisodeModel')
-            ->where('id', $note->episode_id)
-            ->decrement('favourites_total');
-    }
-
-    if ($note->actor->is_podcast) {
+Events::on('on_post_undo_favourite', static function ($actor, $post): void {
+    if ($post->actor->is_podcast) {
         cache()
-            ->deleteMatching("podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("podcast#{$post->actor->podcast->id}*");
         cache()
-            ->deleteMatching("page_podcast#{$note->actor->podcast->id}*");
+            ->deleteMatching("page_podcast#{$post->actor->podcast->id}*");
     }
 
     cache()
-        ->deleteMatching("page_note#{$note->id}*");
-
-    if ($note->is_reply) {
-        cache()->deleteMatching("page_note#{$note->in_reply_to_id}*");
+        ->deleteMatching("page_post#{$post->id}*");
+    if ($post->in_reply_to_id !== null) {
+        cache()->deleteMatching("page_post#{$post->in_reply_to_id}*");
     }
 
     if ($actor->is_podcast) {
@@ -351,34 +298,34 @@ Events::on('on_note_undo_favourite', function ($actor, $note): void {
     }
 });
 
-Events::on('on_block_actor', function (int $actorId): void {
+Events::on('on_block_actor', static function (int $actorId): void {
     cache()->deleteMatching('page_podcast*');
     cache()
         ->deleteMatching('podcast*');
     cache()
-        ->deleteMatching('page_note*');
+        ->deleteMatching('page_post*');
 });
 
-Events::on('on_unblock_actor', function (int $actorId): void {
+Events::on('on_unblock_actor', static function (int $actorId): void {
     cache()->deleteMatching('page_podcast*');
     cache()
         ->deleteMatching('podcast*');
     cache()
-        ->deleteMatching('page_note*');
+        ->deleteMatching('page_post*');
 });
 
-Events::on('on_block_domain', function (string $domainName): void {
+Events::on('on_block_domain', static function (string $domainName): void {
     cache()->deleteMatching('page_podcast*');
     cache()
         ->deleteMatching('podcast*');
     cache()
-        ->deleteMatching('page_note*');
+        ->deleteMatching('page_post*');
 });
 
-Events::on('on_unblock_domain', function (string $domainName): void {
+Events::on('on_unblock_domain', static function (string $domainName): void {
     cache()->deleteMatching('page_podcast*');
     cache()
         ->deleteMatching('podcast*');
     cache()
-        ->deleteMatching('page_note*');
+        ->deleteMatching('page_post*');
 });

app/Config/Exceptions.php

@@ -5,6 +5,10 @@ declare(strict_types=1);
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Debug\ExceptionHandler;
+use CodeIgniter\Debug\ExceptionHandlerInterface;
+use Psr\Log\LogLevel;
+use Throwable;
 
 /**
  * Setup how the exception handler works.
@@ -29,7 +33,7 @@ class Exceptions extends BaseConfig
      * Any status codes here will NOT be logged if logging is turned on.
      * By default, only 404 (Page Not Found) exceptions are ignored.
      *
-     * @var int[]
+     * @var list<int>
      */
     public array $ignoreCodes = [404];
 
@@ -52,7 +56,53 @@ class Exceptions extends BaseConfig
      * In order to specify 2 levels, use "/" to separate.
      * ex. ['server', 'setup/password', 'secret_token']
      *
-     * @var string[]
+     * @var list<string>
      */
     public array $sensitiveDataInTrace = [];
+
+    /**
+     * --------------------------------------------------------------------------
+     * WHETHER TO THROW AN EXCEPTION ON DEPRECATED ERRORS
+     * --------------------------------------------------------------------------
+     * If set to `true`, DEPRECATED errors are only logged and no exceptions are
+     * thrown. This option also works for user deprecations.
+     */
+    public bool $logDeprecations = true;
+
+    /**
+     * --------------------------------------------------------------------------
+     * LOG LEVEL THRESHOLD FOR DEPRECATIONS
+     * --------------------------------------------------------------------------
+     * If `$logDeprecations` is set to `true`, this sets the log level
+     * to which the deprecation will be logged. This should be one of the log
+     * levels recognized by PSR-3.
+     *
+     * The related `Config\Logger::$threshold` should be adjusted, if needed,
+     * to capture logging the deprecations.
+     */
+    public string $deprecationLogLevel = LogLevel::WARNING;
+
+    /*
+     * DEFINE THE HANDLERS USED
+     * --------------------------------------------------------------------------
+     * Given the HTTP status code, returns exception handler that
+     * should be used to deal with this error. By default, it will run CodeIgniter's
+     * default handler and display the error information in the expected format
+     * for CLI, HTTP, or AJAX requests, as determined by is_cli() and the expected
+     * response format.
+     *
+     * Custom handlers can be returned if you want to handle one or more specific
+     * error codes yourself like:
+     *
+     *      if (in_array($statusCode, [400, 404, 500])) {
+     *          return new \App\Libraries\MyExceptionHandler();
+     *      }
+     *      if ($exception instanceOf PageNotFoundException) {
+     *          return new \App\Libraries\MyExceptionHandler();
+     *      }
+     */
+    public function handler(int $statusCode, Throwable $exception): ExceptionHandlerInterface
+    {
+        return new ExceptionHandler($this);
+    }
 }