app/Database/Seeds/FakePodcastsAnalyticsSeeder.php

@@ -20,9 +20,11 @@ use CodeIgniter\Database\Seeder;
 use Exception;
 use GeoIp2\Database\Reader;
 use GeoIp2\Exception\AddressNotFoundException;
+use Override;
 
 class FakePodcastsAnalyticsSeeder extends Seeder
 {
+    #[Override]
     public function run(): void
     {
         $jsonUserAgents = json_decode(
@@ -77,34 +79,32 @@ class FakePodcastsAnalyticsSeeder extends Seeder
 
                 for (
                     $lineNumber = 0;
-                    $lineNumber < rand(1, (int) $probability1);
+                    $lineNumber < random_int(1, (int) $probability1);
                     ++$lineNumber
                 ) {
                     $probability2 = floor(exp(6 - $age / 20)) + 10;
 
                     $player =
                         $jsonUserAgents[
-                            rand(1, count($jsonUserAgents) - 1)
+                            random_int(1, count($jsonUserAgents) - 1)
                         ];
                     $service =
                         $jsonRSSUserAgents[
-                            rand(1, count($jsonRSSUserAgents) - 1)
+                            random_int(1, count($jsonRSSUserAgents) - 1)
                         ]['slug'];
-                    $app = isset($player['app']) ? $player['app'] : '';
-                    $device = isset($player['device'])
-                        ? $player['device']
-                        : '';
-                    $os = isset($player['os']) ? $player['os'] : '';
-                    $isBot = isset($player['bot']) ? $player['bot'] : 0;
+                    $app = $player['app'] ?? '';
+                    $device = $player['device'] ?? '';
+                    $os = $player['os'] ?? '';
+                    $isBot = $player['bot'] ?? 0;
 
                     $fakeIp =
-                        rand(0, 255) .
+                        random_int(0, 255) .
                         '.' .
-                        rand(0, 255) .
+                        random_int(0, 255) .
                         '.' .
-                        rand(0, 255) .
+                        random_int(0, 255) .
                         '.' .
-                        rand(0, 255);
+                        random_int(0, 255);
 
                     $cityReader = new Reader(WRITEPATH . 'uploads/GeoLite2-City/GeoLite2-City.mmdb');
 
@@ -115,9 +115,7 @@ class FakePodcastsAnalyticsSeeder extends Seeder
                     try {
                         $city = $cityReader->city($fakeIp);
 
-                        $countryCode = $city->country->isoCode === null
-                            ? 'N/A'
-                            : $city->country->isoCode;
+                        $countryCode = $city->country->isoCode ?? 'N/A';
 
                         $regionCode = $city->subdivisions === []
                             ? 'N/A'
@@ -128,20 +126,20 @@ class FakePodcastsAnalyticsSeeder extends Seeder
                         //Bad luck, bad IP, nothing to do.
                     }
 
-                    $hits = rand(0, (int) $probability2);
+                    $hits = random_int(0, (int) $probability2);
 
                     $analyticsPodcasts[] = [
                         'podcast_id'       => $podcast->id,
                         'date'             => date('Y-m-d', $date),
-                        'duration'         => rand(60, 3600),
-                        'bandwidth'        => rand(1000000, 10000000),
+                        'duration'         => random_int(60, 3600),
+                        'bandwidth'        => random_int(1000000, 10000000),
                         'hits'             => $hits,
                         'unique_listeners' => $hits,
                     ];
                     $analyticsPodcastsByHour[] = [
                         'podcast_id' => $podcast->id,
                         'date'       => date('Y-m-d', $date),
-                        'hour'       => rand(0, 23),
+                        'hour'       => random_int(0, 23),
                         'hits'       => $hits,
                     ];
                     $analyticsPodcastsByCountry[] = [

app/Database/Seeds/FakeWebsiteAnalyticsSeeder.php

@@ -18,6 +18,7 @@ use App\Models\EpisodeModel;
 use App\Models\PodcastModel;
 use CodeIgniter\Database\Seeder;
 use Exception;
+use Override;
 
 class FakeWebsiteAnalyticsSeeder extends Seeder
 {
@@ -181,6 +182,7 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
         'WOSBrowser',
     ];
 
+    #[Override]
     public function run(): void
     {
         $podcast = (new PodcastModel())->first();
@@ -216,23 +218,23 @@ class FakeWebsiteAnalyticsSeeder extends Seeder
 
                 for (
                     $lineNumber = 0;
-                    $lineNumber < rand(1, $probability1);
+                    $lineNumber < random_int(1, $probability1);
                     ++$lineNumber
                 ) {
                     $probability2 = (int) floor(exp(6 - $age / 20)) + 10;
 
                     $domain =
-                        $this->domains[rand(0, count($this->domains) - 1)];
+                        $this->domains[random_int(0, count($this->domains) - 1)];
                     $keyword =
                         $this->keywords[
-                            rand(0, count($this->keywords) - 1)
+                            random_int(0, count($this->keywords) - 1)
                         ];
                     $browser =
                         $this->browsers[
-                            rand(0, count($this->browsers) - 1)
+                            random_int(0, count($this->browsers) - 1)
                         ];
 
-                    $hits = rand(0, $probability2);
+                    $hits = random_int(0, $probability2);
 
                     $websiteByBrowser[] = [
                         'podcast_id' => $podcast->id,

app/Database/Seeds/LanguageSeeder.php

@@ -18,9 +18,11 @@ declare(strict_types=1);
 namespace App\Database\Seeds;
 
 use CodeIgniter\Database\Seeder;
+use Override;
 
 class LanguageSeeder extends Seeder
 {
+    #[Override]
     public function run(): void
     {
         $data = [

app/Entities/Actor.php

@@ -12,6 +12,7 @@ namespace App\Entities;
 
 use App\Models\PodcastModel;
 use Modules\Fediverse\Entities\Actor as FediverseActor;
+use Override;
 use RuntimeException;
 
 /**
@@ -42,6 +43,7 @@ class Actor extends FediverseActor
         return $this->podcast;
     }
 
+    #[Override]
     public function getAvatarImageUrl(): string
     {
         if ($this->podcast instanceof Podcast) {
@@ -51,6 +53,7 @@ class Actor extends FediverseActor
         return parent::getAvatarImageUrl();
     }
 
+    #[Override]
     public function getAvatarImageMimetype(): string
     {
         if ($this->podcast instanceof Podcast) {

app/Entities/Clip/BaseClip.php

@@ -36,7 +36,7 @@ use Modules\Media\Models\MediaModel;
  * @property string $type
  * @property int|null $media_id
  * @property Video|Audio|null $media
- * @property array|null $metadata
+ * @property array<mixed>|null $metadata
  * @property string $status
  * @property string $logs
  * @property User $user
@@ -84,7 +84,7 @@ class BaseClip extends Entity
     /**
      * @param array<string, mixed>|null $data
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         parent::__construct($data);
     }
@@ -136,7 +136,7 @@ class BaseClip extends Entity
             $media = new Audio([
                 'file_key'      => $fileKey,
                 'language_code' => $this->getPodcast()
-->language_code,
+                    ->language_code,
                 'uploaded_by' => $this->attributes['updated_by'],
                 'updated_by'  => $this->attributes['updated_by'],
             ]);

app/Entities/Clip/VideoClip.php

@@ -13,9 +13,10 @@ namespace App\Entities\Clip;
 use CodeIgniter\Files\File;
 use Modules\Media\Entities\Video;
 use Modules\Media\Models\MediaModel;
+use Override;
 
 /**
- * @property array $theme
+ * @property array{name:string,preview:string} $theme
  * @property string $format
  */
 class VideoClip extends BaseClip
@@ -25,7 +26,7 @@ class VideoClip extends BaseClip
     /**
      * @param array<string, mixed>|null $data
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         parent::__construct($data);
 
@@ -36,7 +37,7 @@ class VideoClip extends BaseClip
     }
 
     /**
-     * @param array<string, string> $theme
+     * @param array{name:string,preview:string} $theme
      */
     public function setTheme(array $theme): self
     {
@@ -63,6 +64,7 @@ class VideoClip extends BaseClip
         return $this;
     }
 
+    #[Override]
     public function setMedia(File $file, string $fileKey): static
     {
         if ($this->attributes['media_id'] !== null) {
@@ -73,7 +75,7 @@ class VideoClip extends BaseClip
         $video = new Video([
             'file_key'      => $fileKey,
             'language_code' => $this->getPodcast()
-->language_code,
+                ->language_code,
             'uploaded_by' => $this->attributes['created_by'],
             'updated_by'  => $this->attributes['created_by'],
         ]);

app/Entities/Episode.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace App\Entities;
 
 use App\Entities\Clip\Soundbite;
-use App\Libraries\SimpleRSSElement;
 use App\Models\ClipModel;
 use App\Models\EpisodeCommentModel;
 use App\Models\EpisodeModel;
@@ -22,7 +21,6 @@ use CodeIgniter\Entity\Entity;
 use CodeIgniter\Files\File;
 use CodeIgniter\HTTP\Files\UploadedFile;
 use CodeIgniter\I18n\Time;
-use Config\Images;
 use Exception;
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\Autolink\AutolinkExtension;
@@ -30,14 +28,13 @@ use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension;
 use League\CommonMark\Extension\DisallowedRawHtml\DisallowedRawHtmlExtension;
 use League\CommonMark\Extension\SmartPunct\SmartPunctExtension;
 use League\CommonMark\MarkdownConverter;
-use Modules\Analytics\OP3;
 use Modules\Media\Entities\Audio;
 use Modules\Media\Entities\Chapters;
 use Modules\Media\Entities\Image;
 use Modules\Media\Entities\Transcript;
 use Modules\Media\Models\MediaModel;
+use Override;
 use RuntimeException;
-use SimpleXMLElement;
 
 /**
  * @property int $id
@@ -74,12 +71,10 @@ use SimpleXMLElement;
  * @property string|null $location_name
  * @property string|null $location_geo
  * @property string|null $location_osm
- * @property array|null $custom_rss
- * @property string $custom_rss_string
  * @property bool $is_published_on_hubs
+ * @property int $downloads_count
  * @property int $posts_count
  * @property int $comments_count
- * @property int $downloads
  * @property EpisodeComment[]|null $comments
  * @property bool $is_premium
  * @property int $created_by
@@ -95,19 +90,19 @@ use SimpleXMLElement;
  */
 class Episode extends Entity
 {
-    protected Podcast $podcast;
+    public string $link = '';
 
-    protected string $link;
+    public string $audio_url = '';
 
-    protected ?Audio $audio = null;
+    public string $audio_web_url = '';
 
-    protected string $audio_url;
+    public string $audio_opengraph_url = '';
 
-    protected string $audio_web_url;
+    protected Podcast $podcast;
 
-    protected string $audio_opengraph_url;
+    protected ?Audio $audio = null;
 
-    protected string $embed_url;
+    protected string $embed_url = '';
 
     protected ?Image $cover = null;
 
@@ -117,8 +112,6 @@ class Episode extends Entity
 
     protected ?Chapters $chapters = null;
 
-    protected int $downloads = 0;
-
     /**
      * @var Person[]|null
      */
@@ -141,8 +134,6 @@ class Episode extends Entity
 
     protected ?Location $location = null;
 
-    protected string $custom_rss_string;
-
     protected ?string $publication_status = null;
 
     /**
@@ -177,8 +168,8 @@ class Episode extends Entity
         'location_name'         => '?string',
         'location_geo'          => '?string',
         'location_osm'          => '?string',
-        'custom_rss'            => '?json-array',
         'is_published_on_hubs'  => 'boolean',
+        'downloads_count'       => 'integer',
         'posts_count'           => 'integer',
         'comments_count'        => 'integer',
         'is_premium'            => 'boolean',
@@ -186,7 +177,32 @@ class Episode extends Entity
         'updated_by'            => 'integer',
     ];
 
-    public function setCover(UploadedFile | File $file = null): self
+    /**
+     * @param array<string, mixed> $data
+     */
+    #[Override]
+    public function injectRawData(array $data): static
+    {
+        parent::injectRawData($data);
+
+        $this->link = url_to('episode', esc($this->getPodcast()->handle, 'url'), esc($this->attributes['slug'], 'url'));
+
+        $this->audio_url = url_to(
+            'episode-audio',
+            $this->getPodcast()
+                ->handle,
+            $this->slug,
+            $this->getAudio()
+                ->file_extension,
+        );
+
+        $this->audio_opengraph_url = $this->audio_url . '?_from=-+Open+Graph+-';
+        $this->audio_web_url = $this->audio_url . '?_from=-+Website+-';
+
+        return $this;
+    }
+
+    public function setCover(UploadedFile | File|null $file = null): self
     {
         if (! $file instanceof File || ($file instanceof UploadedFile && ! $file->isValid())) {
             return $this;
@@ -201,8 +217,8 @@ class Episode extends Entity
         } else {
             $cover = new Image([
                 'file_key' => 'podcasts/' . $this->getPodcast()->handle . '/' . $this->attributes['slug'] . '.' . $file->getExtension(),
-                'sizes'    => config(Images::class)
-->podcastCoverSizes,
+                'sizes'    => config('Images')
+                    ->podcastCoverSizes,
                 'uploaded_by' => $this->attributes['updated_by'],
                 'updated_by'  => $this->attributes['updated_by'],
             ]);
@@ -232,7 +248,7 @@ class Episode extends Entity
         return $this->cover;
     }
 
-    public function setAudio(UploadedFile | File $file = null): self
+    public function setAudio(UploadedFile | File|null $file = null): self
     {
         if (! $file instanceof File || ($file instanceof UploadedFile && ! $file->isValid())) {
             return $this;
@@ -269,7 +285,7 @@ class Episode extends Entity
         return $this->audio;
     }
 
-    public function setTranscript(UploadedFile | File $file = null): self
+    public function setTranscript(UploadedFile | File|null $file = null): self
     {
         if (! $file instanceof File || ($file instanceof UploadedFile && ! $file->isValid())) {
             return $this;
@@ -285,7 +301,7 @@ class Episode extends Entity
             $transcript = new Transcript([
                 'file_key'      => 'podcasts/' . $this->getPodcast()->handle . '/' . $this->attributes['slug'] . '-transcript.' . $file->getExtension(),
                 'language_code' => $this->getPodcast()
-->language_code,
+                    ->language_code,
                 'uploaded_by' => $this->attributes['updated_by'],
                 'updated_by'  => $this->attributes['updated_by'],
             ]);
@@ -306,7 +322,7 @@ class Episode extends Entity
         return $this->transcript;
     }
 
-    public function setChapters(UploadedFile | File $file = null): self
+    public function setChapters(UploadedFile | File|null $file = null): self
     {
         if (! $file instanceof File || ($file instanceof UploadedFile && ! $file->isValid())) {
             return $this;
@@ -322,7 +338,7 @@ class Episode extends Entity
             $chapters = new Chapters([
                 'file_key'      => 'podcasts/' . $this->getPodcast()->handle . '/' . $this->attributes['slug'] . '-chapters' . '.' . $file->getExtension(),
                 'language_code' => $this->getPodcast()
-->language_code,
+                    ->language_code,
                 'uploaded_by' => $this->attributes['updated_by'],
                 'updated_by'  => $this->attributes['updated_by'],
             ]);
@@ -343,40 +359,6 @@ class Episode extends Entity
         return $this->chapters;
     }
 
-    public function getAudioUrl(): string
-    {
-        $audioURL = url_to(
-            'episode-audio',
-            $this->getPodcast()
-->handle,
-            $this->slug,
-            $this->getAudio()
-->file_extension
-        );
-
-        // Wrap episode url with OP3 if episode is public and OP3 is enabled on this podcast
-        if (! $this->is_premium && service('settings')->get(
-            'Analytics.enableOP3',
-            'podcast:' . $this->podcast_id
-        )) {
-            $op3 = new OP3(config('Analytics')->OP3);
-
-            return $op3->wrap($audioURL, $this);
-        }
-
-        return $audioURL;
-    }
-
-    public function getAudioWebUrl(): string
-    {
-        return $this->getAudioUrl() . '?_from=-+Website+-';
-    }
-
-    public function getAudioOpengraphUrl(): string
-    {
-        return $this->getAudioUrl() . '?_from=-+Open+Graph+-';
-    }
-
     /**
      * Gets transcript url from transcript file uri if it exists or returns the transcript_remote_url which can be null.
      */
@@ -469,12 +451,7 @@ class Episode extends Entity
         return $this->comments;
     }
 
-    public function getLink(): string
-    {
-        return url_to('episode', esc($this->getPodcast()->handle), esc($this->attributes['slug']));
-    }
-
-    public function getEmbedUrl(string $theme = null): string
+    public function getEmbedUrl(?string $theme = null): string
     {
         return $theme
                 ? url_to('embed-theme', esc($this->getPodcast()->handle), esc($this->attributes['slug']), $theme)
@@ -483,7 +460,7 @@ class Episode extends Entity
 
     public function setGuid(?string $guid = null): static
     {
-        $this->attributes['guid'] = $guid === null ? $this->getLink() : $guid;
+        $this->attributes['guid'] = $guid ?? $this->link;
 
         return $this;
     }
@@ -514,34 +491,6 @@ class Episode extends Entity
         return $this;
     }
 
-    public function getDescriptionHtml(?string $serviceSlug = null): string
-    {
-        $descriptionHtml = '';
-        if (
-            $this->getPodcast()
-                ->partner_id !== null &&
-            $this->getPodcast()
-                ->partner_link_url !== null &&
-            $this->getPodcast()
-                ->partner_image_url !== null
-        ) {
-            $descriptionHtml .= "<div><a href=\"{$this->getPartnerLink(
-                $serviceSlug,
-            )}\" rel=\"sponsored noopener noreferrer\" target=\"_blank\"><img src=\"{$this->getPartnerImageUrl(
-                $serviceSlug,
-            )}\" alt=\"Partner image\" /></a></div>";
-        }
-
-        $descriptionHtml .= $this->attributes['description_html'];
-
-        if ($this->getPodcast()->episode_description_footer_html) {
-            $descriptionHtml .= "<footer>{$this->getPodcast()
-->episode_description_footer_html}</footer>";
-        }
-
-        return $descriptionHtml;
-    }
-
     public function getDescription(): string
     {
         if ($this->description === null) {
@@ -610,91 +559,6 @@ class Episode extends Entity
         return $this->location;
     }
 
-    /**
-     * Get custom rss tag as XML String
-     */
-    public function getCustomRssString(): string
-    {
-        if ($this->custom_rss === null) {
-            return '';
-        }
-
-        helper('rss');
-
-        $xmlNode = (new SimpleRSSElement(
-            '<?xml version="1.0" encoding="utf-8"?><rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:podcast="https://podcastindex.org/namespace/1.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"/>',
-        ))
-            ->addChild('channel')
-            ->addChild('item');
-        array_to_rss([
-            'elements' => $this->custom_rss,
-        ], $xmlNode);
-
-        return str_replace(['<item>', '</item>'], '', (string) $xmlNode->asXML());
-    }
-
-    /**
-     * Saves custom rss tag into json
-     */
-    public function setCustomRssString(?string $customRssString = null): static
-    {
-        if ($customRssString === '') {
-            $this->attributes['custom_rss'] = null;
-            return $this;
-        }
-
-        helper('rss');
-
-        $customXML = simplexml_load_string(
-            '<?xml version="1.0" encoding="utf-8"?><rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:podcast="https://podcastindex.org/namespace/1.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"><channel><item>' .
-                $customRssString .
-                '</item></channel></rss>',
-        );
-
-        if (! $customXML instanceof SimpleXMLElement) {
-            // TODO: Failed to parse custom xml, should return error?
-            return $this;
-        }
-
-        $customRssArray = rss_to_array($customXML)['elements'][0]['elements'][0];
-
-        if (array_key_exists('elements', $customRssArray)) {
-            $this->attributes['custom_rss'] = json_encode($customRssArray['elements']);
-        } else {
-            $this->attributes['custom_rss'] = null;
-        }
-
-        return $this;
-    }
-
-    public function getPartnerLink(?string $serviceSlug = null): string
-    {
-        $partnerLink =
-            rtrim((string) $this->getPodcast()->partner_link_url, '/') .
-            '?pid=' .
-            $this->getPodcast()
-                ->partner_id .
-            '&guid=' .
-            urlencode((string) $this->attributes['guid']);
-
-        if ($serviceSlug !== null) {
-            $partnerLink .= '&_from=' . $serviceSlug;
-        }
-
-        return $partnerLink;
-    }
-
-    public function getPartnerImageUrl(string $serviceSlug = null): string
-    {
-        return rtrim((string) $this->getPodcast()->partner_image_url, '/') .
-            '?pid=' .
-            $this->getPodcast()
-                ->partner_id .
-            '&guid=' .
-            urlencode((string) $this->attributes['guid']) .
-            ($serviceSlug !== null ? '&_from=' . $serviceSlug : '');
-    }
-
     public function getPreviewLink(): string
     {
         if ($this->preview_id === null) {

app/Entities/Location.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace App\Entities;
 
 use CodeIgniter\Entity\Entity;
-use Config\Services;
 
 /**
  * @property string $url
@@ -23,15 +22,9 @@ use Config\Services;
  */
 class Location extends Entity
 {
-    /**
-     * @var string
-     */
-    private const OSM_URL = 'https://www.openstreetmap.org/';
+    private const string OSM_URL = 'https://www.openstreetmap.org/';
 
-    /**
-     * @var string
-     */
-    private const NOMINATIM_URL = 'https://nominatim.openstreetmap.org/';
+    private const string NOMINATIM_URL = 'https://nominatim.openstreetmap.org/';
 
     public function __construct(
         protected string $name,
@@ -85,7 +78,7 @@ class Location extends Entity
      */
     public function fetchOsmLocation(): static
     {
-        $client = Services::curlrequest();
+        $client = service('curlrequest');
 
         $response = $client->request(
             'GET',
@@ -109,14 +102,14 @@ class Location extends Entity
 
         if (property_exists($places[0], 'lat') && $places[0]->lat !== null && (property_exists(
             $places[0],
-            'lon'
+            'lon',
         ) && $places[0]->lon !== null)) {
             $this->attributes['geo'] = "geo:{$places[0]->lat},{$places[0]->lon}";
         }
 
         if (property_exists($places[0], 'osm_type') && $places[0]->osm_type !== null && (property_exists(
             $places[0],
-            'osm_id'
+            'osm_id',
         ) && $places[0]->osm_id !== null)) {
             $this->attributes['osm'] = strtoupper(substr((string) $places[0]->osm_type, 0, 1)) . $places[0]->osm_id;
         }

app/Entities/Person.php

@@ -14,7 +14,6 @@ use App\Models\PersonModel;
 use CodeIgniter\Entity\Entity;
 use CodeIgniter\Files\File;
 use CodeIgniter\HTTP\Files\UploadedFile;
-use Config\Images;
 use Modules\Media\Entities\Image;
 use Modules\Media\Models\MediaModel;
 use RuntimeException;
@@ -57,7 +56,7 @@ class Person extends Entity
     /**
      * Saves the person avatar in `public/media/persons/`
      */
-    public function setAvatar(UploadedFile | File $file = null): static
+    public function setAvatar(UploadedFile | File|null $file = null): static
     {
         if (! $file instanceof File || ($file instanceof UploadedFile && ! $file->isValid())) {
             return $this;
@@ -72,8 +71,8 @@ class Person extends Entity
         } else {
             $avatar = new Image([
                 'file_key' => 'persons/' . $this->attributes['unique_name'] . '.' . $file->getExtension(),
-                'sizes'    => config(Images::class)
-->personAvatarSizes,
+                'sizes'    => config('Images')
+                    ->personAvatarSizes,
                 'uploaded_by' => $this->attributes['updated_by'],
                 'updated_by'  => $this->attributes['updated_by'],
             ]);
@@ -111,7 +110,7 @@ class Person extends Entity
             $this->roles = (new PersonModel())->getPersonRoles(
                 $this->id,
                 (int) $this->attributes['podcast_id'],
-                array_key_exists('episode_id', $this->attributes) ? (int) $this->attributes['episode_id'] : null
+                array_key_exists('episode_id', $this->attributes) ? (int) $this->attributes['episode_id'] : null,
             );
         }
 

app/Entities/Podcast.php

@@ -10,18 +10,15 @@ declare(strict_types=1);
 
 namespace App\Entities;
 
-use App\Libraries\SimpleRSSElement;
 use App\Models\ActorModel;
 use App\Models\CategoryModel;
 use App\Models\EpisodeModel;
 use App\Models\PersonModel;
-use App\Models\PlatformModel;
 use CodeIgniter\Entity\Entity;
 use CodeIgniter\Files\File;
 use CodeIgniter\HTTP\Files\UploadedFile;
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Shield\Entities\User;
-use Config\Images;
 use Exception;
 use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\Autolink\AutolinkExtension;
@@ -32,6 +29,8 @@ use League\CommonMark\MarkdownConverter;
 use Modules\Auth\Models\UserModel;
 use Modules\Media\Entities\Image;
 use Modules\Media\Models\MediaModel;
+use Modules\Platforms\Entities\Platform;
+use Modules\Platforms\Models\PlatformModel;
 use Modules\PremiumPodcasts\Entities\Subscription;
 use Modules\PremiumPodcasts\Models\SubscriptionModel;
 use RuntimeException;
@@ -62,12 +61,8 @@ use RuntimeException;
  * @property string|null $publisher
  * @property string $owner_name
  * @property string $owner_email
- * @property bool $is_owner_email_removed_from_feed
  * @property string $type
- * @property string $medium
  * @property string|null $copyright
- * @property string|null $episode_description_footer_markdown
- * @property string|null $episode_description_footer_html
  * @property bool $is_blocked
  * @property bool $is_completed
  * @property bool $is_locked
@@ -77,15 +72,7 @@ use RuntimeException;
  * @property string|null $location_name
  * @property string|null $location_geo
  * @property string|null $location_osm
- * @property string|null $payment_pointer
- * @property array|null $custom_rss
- * @property bool $is_op3_enabled
- * @property string $op3_url
- * @property string $custom_rss_string
  * @property bool $is_published_on_hubs
- * @property string|null $partner_id
- * @property string|null $partner_link_url
- * @property string|null $partner_image_url
  * @property int $created_by
  * @property int $updated_by
  * @property string $publication_status
@@ -125,9 +112,9 @@ class Podcast extends Entity
     protected ?array $other_categories = null;
 
     /**
-     * @var string[]|null
+     * @var int[]
      */
-    protected ?array $other_categories_ids = null;
+    protected array $other_categories_ids = [];
 
     /**
      * @var Episode[]|null
@@ -166,8 +153,6 @@ class Podcast extends Entity
 
     protected ?Location $location = null;
 
-    protected string $custom_rss_string;
-
     protected ?string $publication_status = null;
 
     /**
@@ -180,44 +165,35 @@ class Podcast extends Entity
      * @var array<string, string>
      */
     protected $casts = [
-        'id'                                  => 'integer',
-        'guid'                                => 'string',
-        'actor_id'                            => 'integer',
-        'handle'                              => 'string',
-        'title'                               => 'string',
-        'description_markdown'                => 'string',
-        'description_html'                    => 'string',
-        'cover_id'                            => 'int',
-        'banner_id'                           => '?int',
-        'language_code'                       => 'string',
-        'category_id'                         => 'integer',
-        'parental_advisory'                   => '?string',
-        'publisher'                           => '?string',
-        'owner_name'                          => 'string',
-        'owner_email'                         => 'string',
-        'is_owner_email_removed_from_feed'    => 'boolean',
-        'type'                                => 'string',
-        'medium'                              => 'string',
-        'copyright'                           => '?string',
-        'episode_description_footer_markdown' => '?string',
-        'episode_description_footer_html'     => '?string',
-        'is_blocked'                          => 'boolean',
-        'is_completed'                        => 'boolean',
-        'is_locked'                           => 'boolean',
-        'is_premium_by_default'               => 'boolean',
-        'imported_feed_url'                   => '?string',
-        'new_feed_url'                        => '?string',
-        'location_name'                       => '?string',
-        'location_geo'                        => '?string',
-        'location_osm'                        => '?string',
-        'payment_pointer'                     => '?string',
-        'custom_rss'                          => '?json-array',
-        'is_published_on_hubs'                => 'boolean',
-        'partner_id'                          => '?string',
-        'partner_link_url'                    => '?string',
-        'partner_image_url'                   => '?string',
-        'created_by'                          => 'integer',
-        'updated_by'                          => 'integer',
+        'id'                    => 'integer',
+        'guid'                  => 'string',
+        'actor_id'              => 'integer',
+        'handle'                => 'string',
+        'title'                 => 'string',
+        'description_markdown'  => 'string',
+        'description_html'      => 'string',
+        'cover_id'              => 'int',
+        'banner_id'             => '?int',
+        'language_code'         => 'string',
+        'category_id'           => 'integer',
+        'parental_advisory'     => '?string',
+        'publisher'             => '?string',
+        'owner_name'            => 'string',
+        'owner_email'           => 'string',
+        'type'                  => 'string',
+        'copyright'             => '?string',
+        'is_blocked'            => 'boolean',
+        'is_completed'          => 'boolean',
+        'is_locked'             => 'boolean',
+        'is_premium_by_default' => 'boolean',
+        'imported_feed_url'     => '?string',
+        'new_feed_url'          => '?string',
+        'location_name'         => '?string',
+        'location_geo'          => '?string',
+        'location_osm'          => '?string',
+        'is_published_on_hubs'  => 'boolean',
+        'created_by'            => 'integer',
+        'updated_by'            => 'integer',
     ];
 
     public function getAtHandle(): string
@@ -239,7 +215,7 @@ class Podcast extends Entity
         return $this->actor;
     }
 
-    public function setCover(UploadedFile | File $file = null): self
+    public function setCover(UploadedFile | File|null $file = null): self
     {
         if (! $file instanceof File || ($file instanceof UploadedFile && ! $file->isValid())) {
             return $this;
@@ -254,8 +230,8 @@ class Podcast extends Entity
         } else {
             $cover = new Image([
                 'file_key' => 'podcasts/' . $this->attributes['handle'] . '/cover.' . $file->getExtension(),
-                'sizes'    => config(Images::class)
-->podcastCoverSizes,
+                'sizes'    => config('Images')
+                    ->podcastCoverSizes,
                 'uploaded_by' => $this->attributes['updated_by'],
                 'updated_by'  => $this->attributes['updated_by'],
             ]);
@@ -282,7 +258,7 @@ class Podcast extends Entity
         return $this->cover;
     }
 
-    public function setBanner(UploadedFile | File $file = null): self
+    public function setBanner(UploadedFile | File|null $file = null): self
     {
         if (! $file instanceof File || ($file instanceof UploadedFile && ! $file->isValid())) {
             return $this;
@@ -297,8 +273,8 @@ class Podcast extends Entity
         } else {
             $banner = new Image([
                 'file_key' => 'podcasts/' . $this->attributes['handle'] . '/banner.' . $file->getExtension(),
-                'sizes'    => config(Images::class)
-->podcastBannerSizes,
+                'sizes'    => config('Images')
+                    ->podcastBannerSizes,
                 'uploaded_by' => $this->attributes['updated_by'],
                 'updated_by'  => $this->attributes['updated_by'],
             ]);
@@ -454,42 +430,6 @@ class Podcast extends Entity
         return $this;
     }
 
-    public function setEpisodeDescriptionFooterMarkdown(?string $episodeDescriptionFooterMarkdown = null): static
-    {
-        if ($episodeDescriptionFooterMarkdown === null || $episodeDescriptionFooterMarkdown === '') {
-            $this->attributes[
-                'episode_description_footer_markdown'
-            ] = null;
-            $this->attributes[
-                'episode_description_footer_html'
-            ] = null;
-
-            return $this;
-        }
-
-        $config = [
-            'html_input'         => 'escape',
-            'allow_unsafe_links' => false,
-        ];
-
-        $environment = new Environment($config);
-        $environment->addExtension(new CommonMarkCoreExtension());
-        $environment->addExtension(new AutolinkExtension());
-        $environment->addExtension(new SmartPunctExtension());
-        $environment->addExtension(new DisallowedRawHtmlExtension());
-
-        $converter = new MarkdownConverter($environment);
-
-        $this->attributes[
-            'episode_description_footer_markdown'
-        ] = $episodeDescriptionFooterMarkdown;
-        $this->attributes[
-            'episode_description_footer_html'
-        ] = $converter->convert($episodeDescriptionFooterMarkdown);
-
-        return $this;
-    }
-
     public function getDescription(): string
     {
         if ($this->description === null) {
@@ -528,7 +468,7 @@ class Podcast extends Entity
         }
 
         if ($this->podcasting_platforms === null) {
-            $this->podcasting_platforms = (new PlatformModel())->getPodcastPlatforms($this->id, 'podcasting');
+            $this->podcasting_platforms = (new PlatformModel())->getPlatforms($this->id, 'podcasting');
         }
 
         return $this->podcasting_platforms;
@@ -546,7 +486,7 @@ class Podcast extends Entity
         }
 
         if ($this->social_platforms === null) {
-            $this->social_platforms = (new PlatformModel())->getPodcastPlatforms($this->id, 'social');
+            $this->social_platforms = (new PlatformModel())->getPlatforms($this->id, 'social');
         }
 
         return $this->social_platforms;
@@ -564,7 +504,7 @@ class Podcast extends Entity
         }
 
         if ($this->funding_platforms === null) {
-            $this->funding_platforms = (new PlatformModel())->getPodcastPlatforms($this->id, 'funding');
+            $this->funding_platforms = (new PlatformModel())->getPlatforms($this->id, 'funding');
         }
 
         return $this->funding_platforms;
@@ -587,11 +527,11 @@ class Podcast extends Entity
     }
 
     /**
-     * @return int[]|string[]
+     * @return int[]
      */
     public function getOtherCategoriesIds(): array
     {
-        if ($this->other_categories_ids === null) {
+        if ($this->other_categories_ids === []) {
             $this->other_categories_ids = array_column($this->getOtherCategories(), 'id');
         }
 
@@ -638,68 +578,9 @@ class Podcast extends Entity
         return $this->location;
     }
 
-    /**
-     * Get custom rss tag as XML String
-     */
-    public function getCustomRssString(): string
-    {
-        if ($this->attributes['custom_rss'] === null) {
-            return '';
-        }
-
-        helper('rss');
-
-        $xmlNode = (new SimpleRSSElement(
-            '<?xml version="1.0" encoding="utf-8"?><rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:podcast="https://podcastindex.org/namespace/1.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"/>',
-        ))->addChild('channel');
-        array_to_rss([
-            'elements' => $this->custom_rss,
-        ], $xmlNode);
-
-        return str_replace(['<channel>', '</channel>'], '', (string) $xmlNode->asXML());
-    }
-
-    /**
-     * Saves custom rss tag into json
-     */
-    public function setCustomRssString(string $customRssString): static
-    {
-        if ($customRssString === '') {
-            $this->attributes['custom_rss'] = null;
-            return $this;
-        }
-
-        helper('rss');
-        $customRssArray = rss_to_array(
-            simplexml_load_string(
-                '<?xml version="1.0" encoding="utf-8"?><rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:podcast="https://podcastindex.org/namespace/1.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" version="2.0"><channel>' .
-                    $customRssString .
-                    '</channel></rss>',
-            ),
-        )['elements'][0];
-
-        if (array_key_exists('elements', $customRssArray)) {
-            $this->attributes['custom_rss'] = json_encode($customRssArray['elements']);
-        } else {
-            $this->attributes['custom_rss'] = null;
-        }
-
-        return $this;
-    }
-
     public function getIsPremium(): bool
     {
         // podcast is premium if at least one of its episodes is set as premium
         return (new EpisodeModel())->doesPodcastHavePremiumEpisodes($this->id);
     }
-
-    public function getIsOp3Enabled(): bool
-    {
-        return service('settings')->get('Analytics.enableOP3', 'podcast:' . $this->id);
-    }
-
-    public function getOp3Url(): string
-    {
-        return 'https://op3.dev/show/' . $this->guid;
-    }
 }

app/Filters/AllowCorsFilter.php

@@ -7,21 +7,28 @@ namespace App\Filters;
 use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
+use Override;
 
 class AllowCorsFilter implements FilterInterface
 {
     /**
-     * @param string[]|null $arguments
+     * @param list<string>|null $arguments
+     *
+     * @return RequestInterface|ResponseInterface|string|null
      */
-    public function before(RequestInterface $request, $arguments = null): void
+    #[Override]
+    public function before(RequestInterface $request, $arguments = null)
     {
-        // Do something here
+        return null;
     }
 
     /**
-     * @param string[]|null $arguments
+     * @param list<string>|null $arguments
+     *
+     * @return ResponseInterface|null
      */
-    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null): void
+    #[Override]
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
         if (! $response->hasHeader('Cache-Control')) {
             $response->setHeader('Cache-Control', 'public, max-age=86400');
@@ -31,5 +38,7 @@ class AllowCorsFilter implements FilterInterface
             ->setHeader('Access-Control-Allow-Headers', '*') // for allowing any headers, insecure
             ->setHeader('Access-Control-Allow-Methods', 'GET, OPTIONS') // allows GET and OPTIONS methods only
             ->setHeader('Access-Control-Max-Age', '86400');
+
+        return $response;
     }
 }

app/Helpers/breadcrumb_helper.php

@@ -2,14 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * @copyright  2020 Ad Aures
- * @license    https://www.gnu.org/licenses/agpl-3.0.en.html AGPL3
- * @link       https://castopod.org/
- */
-
-use Config\Services;
-
 if (! function_exists('render_breadcrumb')) {
     /**
      * Renders the breadcrumb navigation through the Breadcrumb service
@@ -17,20 +9,18 @@ if (! function_exists('render_breadcrumb')) {
      * @param string|null $class to be added to the breadcrumb nav
      * @return string html breadcrumb
      */
-    function render_breadcrumb(string $class = null): string
+    function render_breadcrumb(?string $class = null): string
     {
-        $breadcrumb = Services::breadcrumb();
-        return $breadcrumb->render($class);
+        return service('breadcrumb')->render($class);
     }
 }
 
 if (! function_exists('replace_breadcrumb_params')) {
     /**
-     * @param string[] $newParams
+     * @param array<string|int,string> $newParams
      */
     function replace_breadcrumb_params(array $newParams): void
     {
-        $breadcrumb = Services::breadcrumb();
-        $breadcrumb->replaceParams(esc($newParams));
+        service('breadcrumb')->replaceParams($newParams);
     }
 }

app/Helpers/components_helper.php

@@ -16,31 +16,6 @@ use CodeIgniter\View\Table;
 
 // ------------------------------------------------------------------------
 
-if (! function_exists('hint_tooltip')) {
-    /**
-     * Hint component
-     *
-     * Used to produce tooltip with a question mark icon for hint texts
-     *
-     * @param string $hintText The hint text
-     */
-    function hint_tooltip(string $hintText = '', string $class = ''): string
-    {
-        $tooltip =
-            '<span data-tooltip="bottom" tabindex="0" title="' .
-            esc($hintText) .
-            '" class="inline-block align-middle opacity-75 focus:ring-accent';
-
-        if ($class !== '') {
-            $tooltip .= ' ' . $class;
-        }
-
-        return $tooltip . '">' . icon('question') . '</span>';
-    }
-}
-
-// ------------------------------------------------------------------------
-
 if (! function_exists('data_table')) {
     /**
      * Data table component
@@ -113,12 +88,12 @@ if (! function_exists('publication_pill')) {
      */
     function publication_pill(?Time $publicationDate, string $publicationStatus, string $customClass = ''): string
     {
-        $class = match ($publicationStatus) {
-            'published'     => 'text-pine-500 border-pine-500 bg-pine-50',
-            'scheduled'     => 'text-red-600 border-red-600 bg-red-50',
-            'with_podcast'  => 'text-blue-600 border-blue-600 bg-blue-50',
-            'not_published' => 'text-gray-600 border-gray-600 bg-gray-50',
-            default         => 'text-gray-600 border-gray-600 bg-gray-50',
+        $variant = match ($publicationStatus) {
+            'published'     => 'success',
+            'scheduled'     => 'warning',
+            'with_podcast'  => 'info',
+            'not_published' => 'default',
+            default         => 'default',
         };
 
         $title = match ($publicationStatus) {
@@ -130,14 +105,12 @@ if (! function_exists('publication_pill')) {
 
         $label = lang('Episode.publication_status.' . $publicationStatus);
 
-        return '<span ' . ($title === '' ? '' : 'title="' . $title . '"') . ' class="flex items-center px-1 font-semibold border rounded w-max ' .
-            $class .
-            ' ' .
-            $customClass .
-            '">' .
-            $label .
-            ($publicationStatus === 'with_podcast' ? '<Icon glyph="error-warning" class="flex-shrink-0 ml-1 text-lg" />' : '') .
-            '</span>';
+        // @icon("error-warning-fill")
+        return '<x-Pill ' . ($title === '' ? '' : 'title="' . $title . '"') . ' variant="' . $variant . '" class="' . $customClass .
+            '">' . $label . ($publicationStatus === 'with_podcast' ? icon('error-warning-fill', [
+                'class' => 'flex-shrink-0 ml-1 text-lg',
+            ]) : '') .
+            '</x-Pill>';
     }
 }
 
@@ -156,20 +129,20 @@ if (! function_exists('publication_button')) {
                 $label = lang('Episode.publish');
                 $route = route_to('episode-publish', $podcastId, $episodeId);
                 $variant = 'primary';
-                $iconLeft = 'upload-cloud';
+                $iconLeft = 'upload-cloud-fill'; // @icon("upload-cloud-fill")
                 break;
             case 'with_podcast':
             case 'scheduled':
                 $label = lang('Episode.publish_edit');
                 $route = route_to('episode-publish_edit', $podcastId, $episodeId);
                 $variant = 'warning';
-                $iconLeft = 'upload-cloud';
+                $iconLeft = 'upload-cloud-fill'; // @icon("upload-cloud-fill")
                 break;
             case 'published':
                 $label = lang('Episode.unpublish');
                 $route = route_to('episode-unpublish', $podcastId, $episodeId);
                 $variant = 'danger';
-                $iconLeft = 'cloud-off';
+                $iconLeft = 'cloud-off-fill'; // @icon("cloud-off-fill")
                 break;
             default:
                 $label = '';
@@ -180,7 +153,7 @@ if (! function_exists('publication_button')) {
         }
 
         return <<<HTML
-            <Button variant="{$variant}" uri="{$route}" iconLeft="{$iconLeft}" >{$label}</Button>
+            <x-Button variant="{$variant}" uri="{$route}" iconLeft="{$iconLeft}" >{$label}</x-Button>
         HTML;
     }
 }
@@ -261,7 +234,7 @@ if (! function_exists('episode_publication_status_banner')) {
         $bannerText = lang('Episode.publication_status_banner.text', [
             'publication_status' => $episode->publication_status,
             'publication_date'   => $episode->published_at instanceof Time ? local_datetime(
-                $episode->published_at
+                $episode->published_at,
             ) : null,
         ]);
         $previewLinkLabel = lang('Episode.publication_status_banner.preview');
@@ -294,7 +267,7 @@ if (! function_exists('episode_numbering')) {
         ?int $episodeNumber = null,
         ?int $seasonNumber = null,
         string $class = '',
-        bool $isAbbr = false
+        bool $isAbbr = false,
     ): string {
         if (! $episodeNumber && ! $seasonNumber) {
             return '';
@@ -350,9 +323,11 @@ if (! function_exists('location_link')) {
 
         return anchor(
             $location->url,
-            icon('map-pin', 'mr-2 flex-shrink-0') . '<span class="truncate">' . esc($location->name) . '</span>',
+            icon('map-pin-2-fill', [
+                'class' => 'mr-2 flex-shrink-0',
+            ]) . '<span class="truncate">' . esc($location->name) . '</span>',
             [
-                'class' => 'w-full overflow-hidden inline-flex items-baseline hover:underline focus:ring-accent' .
+                'class' => 'w-full overflow-hidden inline-flex items-baseline hover:underline' .
                     ($class === '' ? '' : " {$class}"),
                 'target' => '_blank',
                 'rel'    => 'noreferrer noopener',
@@ -377,7 +352,6 @@ if (! function_exists('audio_player')) {
                 id="castopod-vm-player"
                 theme="light"
                 language="{$language}"
-                icons="castopod-icons"
                 class="{$class} relative z-0"
                 style="--vm-player-box-shadow:0; --vm-player-theme: hsl(var(--color-accent-base)); --vm-control-focus-color: hsl(var(--color-accent-contrast)); --vm-control-spacing: 4px; --vm-menu-item-focus-bg: hsl(var(--color-background-highlight));"
             >
@@ -385,7 +359,7 @@ if (! function_exists('audio_player')) {
                     <source src="{$source}" type="{$mediaType}" />
                 </vm-audio>
                 <vm-ui>
-                    <vm-icon-library name="castopod-icons"></vm-icon-library>
+                    <vm-icon-library></vm-icon-library>
                     <vm-controls full-width>
                         <vm-playback-control></vm-playback-control>
                         <vm-volume-control></vm-volume-control>
@@ -407,7 +381,7 @@ if (! function_exists('relative_time')) {
     function relative_time(Time $time, string $class = ''): string
     {
         $formatter = new IntlDateFormatter(service(
-            'request'
+            'request',
         )->getLocale(), IntlDateFormatter::MEDIUM, IntlDateFormatter::NONE);
         $translatedDate = $time->toLocalizedString($formatter->getPattern());
         $datetime = $time->format(DateTime::ATOM);
@@ -428,7 +402,7 @@ if (! function_exists('local_datetime')) {
     function local_datetime(Time $time): string
     {
         $formatter = new IntlDateFormatter(service(
-            'request'
+            'request',
         )->getLocale(), IntlDateFormatter::MEDIUM, IntlDateFormatter::LONG);
         $translatedDate = $time->toLocalizedString($formatter->getPattern());
         $datetime = $time->format(DateTime::ATOM);
@@ -457,7 +431,7 @@ if (! function_exists('local_date')) {
     function local_date(Time $time): string
     {
         $formatter = new IntlDateFormatter(service(
-            'request'
+            'request',
         )->getLocale(), IntlDateFormatter::MEDIUM, IntlDateFormatter::NONE);
         $translatedDate = $time->toLocalizedString($formatter->getPattern());
 

app/Helpers/form_helper.php

@@ -23,20 +23,20 @@ if (! function_exists('form_textarea')) {
         // Unsets default rows and cols if defined in extra field as array or string.
         if ((is_array($extra) && array_key_exists('rows', $extra)) || (is_string($extra) && stripos(
             (string) preg_replace('~\s+~', '', $extra),
-            'rows='
+            'rows=',
         ) !== false)) {
             unset($defaults['rows']);
         }
 
         if ((is_array($extra) && array_key_exists('cols', $extra)) || (is_string($extra) && stripos(
             (string) preg_replace('~\s+~', '', $extra),
-            'cols='
+            'cols=',
         ) !== false)) {
             unset($defaults['cols']);
         }
 
         return '<textarea ' . rtrim(parse_form_attributes($data, $defaults)) . stringify_attributes(
-            $extra
+            $extra,
         ) . '>' . $val . "</textarea>\n";
     }
 }

app/Helpers/id3_helper.php

@@ -42,24 +42,16 @@ if (! function_exists('write_audio_file_tags')) {
 
         // populate data array
         $TagData = [
-            'title'  => [esc($episode->title)],
-            'artist' => [
-                $episode->podcast->publisher === null
-                    ? esc($episode->podcast->owner_name)
-                    : $episode->podcast->publisher,
-            ],
+            'title'             => [esc($episode->title)],
+            'artist'            => [$episode->podcast->publisher ?? esc($episode->podcast->owner_name)],
             'album'             => [esc($episode->podcast->title)],
             'year'              => [$episode->published_at instanceof Time ? $episode->published_at->format('Y') : ''],
             'genre'             => ['Podcast'],
             'comment'           => [$episode->description],
             'track_number'      => [(string) $episode->number],
             'copyright_message' => [$episode->podcast->copyright],
-            'publisher'         => [
-                $episode->podcast->publisher === null
-                    ? esc($episode->podcast->owner_name)
-                    : $episode->podcast->publisher,
-            ],
-            'encoded_by' => ['Castopod'],
+            'publisher'         => [$episode->podcast->publisher ?? esc($episode->podcast->owner_name)],
+            'encoded_by'        => ['Castopod'],
 
             // TODO: find a way to add the remaining tags for podcasts as the library doesn't seem to allow it
             // 'website' => [$podcast_url],

app/Helpers/misc_helper.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 use App\Entities\Person;
 use App\Entities\Podcast;
 use Cocur\Slugify\Slugify;
-use Config\App;
 use Config\Images;
 use Modules\Media\Entities\Image;
 
@@ -25,7 +24,7 @@ if (! function_exists('get_browser_language')) {
     function get_browser_language(?string $httpAcceptLanguage = null): string
     {
         if ($httpAcceptLanguage === null) {
-            return config(App::class)->defaultLocale;
+            return config('App')->defaultLocale;
         }
 
         $langs = explode(',', $httpAcceptLanguage);
@@ -164,7 +163,7 @@ if (! function_exists('parse_size')) {
         $size = (float) preg_replace('~[^0-9\.]~', '', $size); // Remove the non-numeric characters from the size.
         if ($unit !== '') {
             // Find the position of the unit in the ordered string which is the power of magnitude to multiply a kilobyte by.
-            return round($size * pow(1024, (float) stripos('bkmgtpezy', $unit[0])));
+            return round($size * 1024 ** ((float) stripos('bkmgtpezy', $unit[0])));
         }
 
         return round($size);
@@ -183,7 +182,7 @@ if (! function_exists('format_bytes')) {
         $pow = floor(($bytes ? log($bytes) : 0) / log($is_binary ? 1024 : 1000));
         $pow = min($pow, count($units) - 1);
 
-        $bytes /= pow($is_binary ? 1024 : 1000, $pow);
+        $bytes /= ($is_binary ? 1024 : 1000) ** $pow;
 
         return round($bytes, $precision) . $units[$pow];
     }
@@ -192,7 +191,7 @@ if (! function_exists('format_bytes')) {
 if (! function_exists('get_site_icon_url')) {
     function get_site_icon_url(string $size): string
     {
-        if (config(App::class)->siteIcon['ico'] === service('settings')->get('App.siteIcon')['ico']) {
+        if (config('App')->siteIcon['ico'] === service('settings')->get('App.siteIcon')['ico']) {
             // return default site icon url
             return base_url(service('settings')->get('App.siteIcon')[$size]);
         }
@@ -205,20 +204,20 @@ if (! function_exists('get_podcast_banner')) {
     function get_podcast_banner_url(Podcast $podcast, string $size): string
     {
         if (! $podcast->banner instanceof Image) {
-            $defaultBanner = config(Images::class)
+            $defaultBanner = config('Images')
                 ->podcastBannerDefaultPaths[service('settings')->get('App.theme')] ?? config(
-                    Images::class
+                    Images::class,
                 )->podcastBannerDefaultPaths['default'];
 
-            $sizes = config(Images::class)
-->podcastBannerSizes;
+            $sizes = config('Images')
+                ->podcastBannerSizes;
 
             $sizeConfig = $sizes[$size];
             helper('filesystem');
 
             // return default site icon url
             return base_url(
-                change_file_path($defaultBanner['path'], '_' . $size, $sizeConfig['extension'] ?? null)
+                change_file_path($defaultBanner['path'], '_' . $size, $sizeConfig['extension'] ?? null),
             );
         }
 
@@ -231,15 +230,15 @@ if (! function_exists('get_podcast_banner_mimetype')) {
     function get_podcast_banner_mimetype(Podcast $podcast, string $size): string
     {
         if (! $podcast->banner instanceof Image) {
-            $sizes = config(Images::class)
-->podcastBannerSizes;
+            $sizes = config('Images')
+                ->podcastBannerSizes;
 
             $sizeConfig = $sizes[$size];
             helper('filesystem');
 
             // return default site icon url
             return array_key_exists('mimetype', $sizeConfig) ? $sizeConfig['mimetype'] : config(
-                Images::class
+                Images::class,
             )->podcastBannerDefaultMimeType;
         }
 
@@ -252,11 +251,11 @@ if (! function_exists('get_avatar_url')) {
     function get_avatar_url(Person $person, string $size): string
     {
         if (! $person->avatar instanceof Image) {
-            $defaultAvatarPath = config(Images::class)
-->avatarDefaultPath;
+            $defaultAvatarPath = config('Images')
+                ->avatarDefaultPath;
 
-            $sizes = config(Images::class)
-->personAvatarSizes;
+            $sizes = config('Images')
+                ->personAvatarSizes;
 
             $sizeConfig = $sizes[$size];
 

app/Helpers/page_helper.php

@@ -9,7 +9,6 @@ declare(strict_types=1);
  */
 
 use App\Models\PageModel;
-use Config\App;
 
 if (! function_exists('render_page_links')) {
     /**
@@ -17,34 +16,34 @@ if (! function_exists('render_page_links')) {
      *
      * @return string html pages navigation
      */
-    function render_page_links(string $class = null, string $podcastHandle = null): string
+    function render_page_links(?string $class = null, ?string $podcastHandle = null): string
     {
         $pages = (new PageModel())->findAll();
         $links = anchor(route_to('home'), lang('Common.home'), [
-            'class' => 'px-2 py-1 underline hover:no-underline focus:ring-accent',
+            'class' => 'px-2 py-1 underline hover:no-underline',
         ]);
         if ($podcastHandle !== null) {
             $links .= anchor(route_to('podcast-links', $podcastHandle), lang('Podcast.links'), [
-                'class' => 'px-2 py-1 underline hover:no-underline focus:ring-accent',
+                'class' => 'px-2 py-1 underline hover:no-underline',
             ]);
         }
 
         $links .= anchor(route_to('credits'), lang('Person.credits'), [
-            'class' => 'px-2 py-1 underline hover:no-underline focus:ring-accent',
+            'class' => 'px-2 py-1 underline hover:no-underline',
         ]);
         $links .= anchor(route_to('map'), lang('Page.map.title'), [
-            'class' => 'px-2 py-1 underline hover:no-underline focus:ring-accent',
+            'class' => 'px-2 py-1 underline hover:no-underline',
         ]);
         foreach ($pages as $page) {
             $links .= anchor($page->link, esc($page->title), [
-                'class' => 'px-2  py-1 underline hover:no-underline focus:ring-accent',
+                'class' => 'px-2  py-1 underline hover:no-underline',
             ]);
         }
 
         // if set in .env, add legal notice link at the end of page links
-        if (config(App::class)->legalNoticeURL !== null) {
-            $links .= anchor(config(App::class)->legalNoticeURL, lang('Common.legal_notice'), [
-                'class'  => 'px-2 py-1 underline hover:no-underline focus:ring-accent',
+        if (config('App')->legalNoticeURL !== null) {
+            $links .= anchor(config('App')->legalNoticeURL, lang('Common.legal_notice'), [
+                'class'  => 'px-2 py-1 underline hover:no-underline',
                 'target' => '_blank',
                 'rel'    => 'noopener noreferrer',
             ]);

app/Helpers/rss_helper.php

@@ -10,13 +10,14 @@ declare(strict_types=1);
 use App\Entities\Category;
 use App\Entities\Location;
 use App\Entities\Podcast;
-use App\Libraries\SimpleRSSElement;
+use App\Libraries\RssFeed;
+use App\Models\PodcastModel;
 use CodeIgniter\I18n\Time;
 use Config\Mimes;
 use Modules\Media\Entities\Chapters;
 use Modules\Media\Entities\Transcript;
+use Modules\Plugins\Core\Plugins;
 use Modules\PremiumPodcasts\Entities\Subscription;
-use Modules\WebSub\Config\WebSub;
 
 if (! function_exists('get_rss_feed')) {
     /**
@@ -28,24 +29,21 @@ if (! function_exists('get_rss_feed')) {
     function get_rss_feed(
         Podcast $podcast,
         string $serviceSlug = '',
-        Subscription $subscription = null,
-        string $token = null
+        ?Subscription $subscription = null,
+        ?string $token = null,
     ): string {
-        $episodes = $podcast->episodes;
-
-        $itunesNamespace = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
+        /** @var Plugins $plugins */
+        $plugins = service('plugins');
 
-        $podcastNamespace = 'https://podcastindex.org/namespace/1.0';
+        $episodes = $podcast->episodes;
 
-        $atomNamespace = 'http://www.w3.org/2005/Atom';
+        $rss = new RssFeed();
 
-        $rss = new SimpleRSSElement(
-            "<?xml version='1.0' encoding='utf-8'?><rss version='2.0' xmlns:itunes='{$itunesNamespace}' xmlns:podcast='{$podcastNamespace}' xmlns:atom='{$atomNamespace}' xmlns:content='http://purl.org/rss/1.0/modules/content/'></rss>"
-        );
+        $plugins->rssBeforeChannel($podcast);
 
         $channel = $rss->addChild('channel');
 
-        $atomLink = $channel->addChild('link', null, $atomNamespace);
+        $atomLink = $channel->addChild('link', null, RssFeed::ATOM_NAMESPACE);
         $atomLink->addAttribute('href', $podcast->feed_url);
         $atomLink->addAttribute('rel', 'self');
         $atomLink->addAttribute('type', 'application/rss+xml');
@@ -54,14 +52,14 @@ if (! function_exists('get_rss_feed')) {
         $websubHubs = config('WebSub')
             ->hubs;
         foreach ($websubHubs as $websubHub) {
-            $atomLinkHub = $channel->addChild('link', null, $atomNamespace);
+            $atomLinkHub = $channel->addChild('link', null, RssFeed::ATOM_NAMESPACE);
             $atomLinkHub->addAttribute('href', $websubHub);
             $atomLinkHub->addAttribute('rel', 'hub');
             $atomLinkHub->addAttribute('type', 'application/rss+xml');
         }
 
         if ($podcast->new_feed_url !== null) {
-            $channel->addChild('new-feed-url', $podcast->new_feed_url, $itunesNamespace);
+            $channel->addChild('new-feed-url', $podcast->new_feed_url, RssFeed::ITUNES_NAMESPACE);
         }
 
         // the last build date corresponds to the creation of the feed.xml cache
@@ -69,19 +67,27 @@ if (! function_exists('get_rss_feed')) {
         $channel->addChild('generator', 'Castopod - https://castopod.org/');
         $channel->addChild('docs', 'https://cyber.harvard.edu/rss/rss.html');
 
-        $channel->addChild('guid', $podcast->guid, $podcastNamespace);
+        if ($podcast->guid === '') {
+            // FIXME: guid shouldn't be empty here as it should be filled upon Podcast creation
+            $uuid = service('uuid');
+            // 'ead4c236-bf58-58c6-a2c6-a6b28d128cb6' is the uuid of the podcast namespace
+            $podcast->guid = $uuid->uuid5('ead4c236-bf58-58c6-a2c6-a6b28d128cb6', $podcast->feed_url)
+                ->toString();
+
+            (new PodcastModel())->save($podcast);
+        }
+
+        $channel->addChild('guid', $podcast->guid, RssFeed::PODCAST_NAMESPACE);
         $channel->addChild('title', $podcast->title, null, false);
         $channel->addChildWithCDATA('description', $podcast->description_html);
 
-        $channel->addChild('medium', $podcast->medium, $podcastNamespace);
-
-        $itunesImage = $channel->addChild('image', null, $itunesNamespace);
+        $itunesImage = $channel->addChild('image', null, RssFeed::ITUNES_NAMESPACE);
 
         $itunesImage->addAttribute('href', $podcast->cover->feed_url);
 
         $channel->addChild('language', $podcast->language_code);
         if ($podcast->location instanceof Location) {
-            $locationElement = $channel->addChild('location', $podcast->location->name, $podcastNamespace);
+            $locationElement = $channel->addChild('location', $podcast->location->name, RssFeed::PODCAST_NAMESPACE);
             if ($podcast->location->geo !== null) {
                 $locationElement->addAttribute('geo', $podcast->location->geo);
             }
@@ -91,32 +97,16 @@ if (! function_exists('get_rss_feed')) {
             }
         }
 
-        if ($podcast->payment_pointer !== null) {
-            $valueElement = $channel->addChild('value', null, $podcastNamespace);
-            $valueElement->addAttribute('type', 'webmonetization');
-            $valueElement->addAttribute('method', 'ILP');
-            $recipientElement = $valueElement->addChild('valueRecipient', null, $podcastNamespace);
-            $recipientElement->addAttribute('name', $podcast->owner_name);
-            $recipientElement->addAttribute('type', 'paymentpointer');
-            $recipientElement->addAttribute('address', $podcast->payment_pointer);
-            $recipientElement->addAttribute('split', '100');
-        }
-
-        if ($podcast->is_owner_email_removed_from_feed) {
-            $channel
-                ->addChild('locked', $podcast->is_locked ? 'yes' : 'no', $podcastNamespace);
-        } else {
-            $channel
-                ->addChild('locked', $podcast->is_locked ? 'yes' : 'no', $podcastNamespace)
-                ->addAttribute('owner', $podcast->owner_email);
-        }
+        $channel
+            ->addChild('locked', $podcast->is_locked ? 'yes' : 'no', RssFeed::PODCAST_NAMESPACE)
+            ->addAttribute('owner', $podcast->owner_email);
 
         if ($podcast->imported_feed_url !== null) {
-            $channel->addChild('previousUrl', $podcast->imported_feed_url, $podcastNamespace);
+            $channel->addChild('previousUrl', $podcast->imported_feed_url, RssFeed::PODCAST_NAMESPACE);
         }
 
         foreach ($podcast->podcasting_platforms as $podcastingPlatform) {
-            $podcastingPlatformElement = $channel->addChild('id', null, $podcastNamespace);
+            $podcastingPlatformElement = $channel->addChild('id', null, RssFeed::PODCAST_NAMESPACE);
             $podcastingPlatformElement->addAttribute('platform', $podcastingPlatform->slug);
             if ($podcastingPlatform->account_id !== null) {
                 $podcastingPlatformElement->addAttribute('id', $podcastingPlatform->account_id);
@@ -127,7 +117,7 @@ if (! function_exists('get_rss_feed')) {
             }
         }
 
-        $castopodSocialElement = $channel->addChild('social', null, $podcastNamespace);
+        $castopodSocialElement = $channel->addChild('social', null, RssFeed::PODCAST_NAMESPACE);
         $castopodSocialElement->addAttribute('priority', '1');
         $castopodSocialElement->addAttribute('platform', 'castopod');
         $castopodSocialElement->addAttribute('protocol', 'activitypub');
@@ -135,7 +125,7 @@ if (! function_exists('get_rss_feed')) {
         $castopodSocialElement->addAttribute('accountUrl', $podcast->link);
 
         foreach ($podcast->social_platforms as $socialPlatform) {
-            $socialElement = $channel->addChild('social', null, $podcastNamespace);
+            $socialElement = $channel->addChild('social', null, RssFeed::PODCAST_NAMESPACE);
             $socialElement->addAttribute('priority', '2');
             $socialElement->addAttribute('platform', $socialPlatform->slug);
 
@@ -143,7 +133,7 @@ if (! function_exists('get_rss_feed')) {
             if (in_array(
                 $socialPlatform->slug,
                 ['mastodon', 'peertube', 'funkwhale', 'misskey', 'mobilizon', 'pixelfed', 'plume', 'writefreely'],
-                true
+                true,
             )) {
                 $socialElement->addAttribute('protocol', 'activitypub');
             } else {
@@ -159,41 +149,41 @@ if (! function_exists('get_rss_feed')) {
             }
 
             if ($socialPlatform->slug === 'mastodon') {
-                $socialSignUpelement = $socialElement->addChild('socialSignUp', null, $podcastNamespace);
+                $socialSignUpelement = $socialElement->addChild('socialSignUp', null, RssFeed::PODCAST_NAMESPACE);
                 $socialSignUpelement->addAttribute('priority', '1');
                 $socialSignUpelement->addAttribute(
                     'homeUrl',
                     parse_url((string) $socialPlatform->link_url, PHP_URL_SCHEME) . '://' . parse_url(
                         (string) $socialPlatform->link_url,
-                        PHP_URL_HOST
-                    ) . '/public'
+                        PHP_URL_HOST,
+                    ) . '/public',
                 );
                 $socialSignUpelement->addAttribute(
                     'signUpUrl',
                     parse_url((string) $socialPlatform->link_url, PHP_URL_SCHEME) . '://' . parse_url(
                         (string) $socialPlatform->link_url,
-                        PHP_URL_HOST
-                    ) . '/auth/sign_up'
+                        PHP_URL_HOST,
+                    ) . '/auth/sign_up',
                 );
                 $castopodSocialSignUpelement = $castopodSocialElement->addChild(
                     'socialSignUp',
                     null,
-                    $podcastNamespace
+                    RssFeed::PODCAST_NAMESPACE,
                 );
                 $castopodSocialSignUpelement->addAttribute('priority', '1');
                 $castopodSocialSignUpelement->addAttribute(
                     'homeUrl',
                     parse_url((string) $socialPlatform->link_url, PHP_URL_SCHEME) . '://' . parse_url(
                         (string) $socialPlatform->link_url,
-                        PHP_URL_HOST
-                    ) . '/public'
+                        PHP_URL_HOST,
+                    ) . '/public',
                 );
                 $castopodSocialSignUpelement->addAttribute(
                     'signUpUrl',
                     parse_url((string) $socialPlatform->link_url, PHP_URL_SCHEME) . '://' . parse_url(
                         (string) $socialPlatform->link_url,
-                        PHP_URL_HOST
-                    ) . '/auth/sign_up'
+                        PHP_URL_HOST,
+                    ) . '/auth/sign_up',
                 );
             }
         }
@@ -202,7 +192,7 @@ if (! function_exists('get_rss_feed')) {
             $fundingPlatformElement = $channel->addChild(
                 'funding',
                 $fundingPlatform->account_id,
-                $podcastNamespace,
+                RssFeed::PODCAST_NAMESPACE,
             );
             $fundingPlatformElement->addAttribute('platform', $fundingPlatform->slug);
             if ($fundingPlatform->link_url !== null) {
@@ -212,7 +202,7 @@ if (! function_exists('get_rss_feed')) {
 
         foreach ($podcast->persons as $person) {
             foreach ($person->roles as $role) {
-                $personElement = $channel->addChild('person', $person->full_name, $podcastNamespace);
+                $personElement = $channel->addChild('person', $person->full_name, RssFeed::PODCAST_NAMESPACE);
 
                 $personElement->addAttribute('img', get_avatar_url($person, 'medium'));
 
@@ -241,34 +231,26 @@ if (! function_exists('get_rss_feed')) {
         $channel->addChild(
             'explicit',
             $podcast->parental_advisory === 'explicit' ? 'true' : 'false',
-            $itunesNamespace,
+            RssFeed::ITUNES_NAMESPACE,
         );
 
-        $channel->addChild(
-            'author',
-            $podcast->publisher ? $podcast->publisher : $podcast->owner_name,
-            $itunesNamespace,
-            false
-        );
+        $channel->addChild('author', $podcast->publisher ?: $podcast->owner_name, RssFeed::ITUNES_NAMESPACE, false);
         $channel->addChild('link', $podcast->link);
 
-        $owner = $channel->addChild('owner', null, $itunesNamespace);
+        $owner = $channel->addChild('owner', null, RssFeed::ITUNES_NAMESPACE);
 
-        $owner->addChild('name', $podcast->owner_name, $itunesNamespace, false);
+        $owner->addChild('name', $podcast->owner_name, RssFeed::ITUNES_NAMESPACE, false);
+        $owner->addChild('email', $podcast->owner_email, RssFeed::ITUNES_NAMESPACE);
 
-        if (! $podcast->is_owner_email_removed_from_feed) {
-            $owner->addChild('email', $podcast->owner_email, $itunesNamespace);
-        }
-
-        $channel->addChild('type', $podcast->type, $itunesNamespace);
+        $channel->addChild('type', $podcast->type, RssFeed::ITUNES_NAMESPACE);
         $podcast->copyright &&
             $channel->addChild('copyright', $podcast->copyright);
-        if ($podcast->is_blocked) {
-            $channel->addChild('block', 'Yes', $itunesNamespace);
+        if ($podcast->is_blocked || $subscription instanceof Subscription) {
+            $channel->addChild('block', 'Yes', RssFeed::ITUNES_NAMESPACE);
         }
 
         if ($podcast->is_completed) {
-            $channel->addChild('complete', 'Yes', $itunesNamespace);
+            $channel->addChild('complete', 'Yes', RssFeed::ITUNES_NAMESPACE);
         }
 
         $image = $channel->addChild('image');
@@ -276,17 +258,16 @@ if (! function_exists('get_rss_feed')) {
         $image->addChild('title', $podcast->title, null, false);
         $image->addChild('link', $podcast->link);
 
-        if ($podcast->custom_rss !== null) {
-            array_to_rss([
-                'elements' => $podcast->custom_rss,
-            ], $channel);
-        }
+        // run plugins hook at the end
+        $plugins->rssAfterChannel($podcast, $channel);
 
         foreach ($episodes as $episode) {
             if ($episode->is_premium && ! $subscription instanceof Subscription) {
                 continue;
             }
 
+            $plugins->rssBeforeItem($episode);
+
             $item = $channel->addChild('item');
             $item->addChild('title', $episode->title, null, false);
             $enclosure = $item->addChild('enclosure');
@@ -306,7 +287,7 @@ if (! function_exists('get_rss_feed')) {
             $item->addChild('guid', $episode->guid);
             $item->addChild('pubDate', $episode->published_at->format(DATE_RFC1123));
             if ($episode->location instanceof Location) {
-                $locationElement = $item->addChild('location', $episode->location->name, $podcastNamespace);
+                $locationElement = $item->addChild('location', $episode->location->name, RssFeed::PODCAST_NAMESPACE);
                 if ($episode->location->geo !== null) {
                     $locationElement->addAttribute('geo', $episode->location->geo);
                 }
@@ -316,10 +297,10 @@ if (! function_exists('get_rss_feed')) {
                 }
             }
 
-            $item->addChildWithCDATA('description', $episode->getDescriptionHtml($serviceSlug));
-            $item->addChild('duration', (string) round($episode->audio->duration), $itunesNamespace);
+            $item->addChildWithCDATA('description', $episode->description_html);
+            $item->addChild('duration', (string) round($episode->audio->duration), RssFeed::ITUNES_NAMESPACE);
             $item->addChild('link', $episode->link);
-            $episodeItunesImage = $item->addChild('image', null, $itunesNamespace);
+            $episodeItunesImage = $item->addChild('image', null, RssFeed::ITUNES_NAMESPACE);
             $episodeItunesImage->addAttribute('href', $episode->cover->feed_url);
 
             $episode->parental_advisory &&
@@ -328,52 +309,61 @@ if (! function_exists('get_rss_feed')) {
                     $episode->parental_advisory === 'explicit'
                         ? 'true'
                         : 'false',
-                    $itunesNamespace,
+                    RssFeed::ITUNES_NAMESPACE,
                 );
 
             $episode->number &&
-                $item->addChild('episode', (string) $episode->number, $itunesNamespace);
+                $item->addChild('episode', (string) $episode->number, RssFeed::ITUNES_NAMESPACE);
             $episode->season_number &&
-                $item->addChild('season', (string) $episode->season_number, $itunesNamespace);
-            $item->addChild('episodeType', $episode->type, $itunesNamespace);
-
-            // add podcast namespace tags for season and episode
-            $episode->season_number &&
-                $item->addChild('season', (string) $episode->season_number, $podcastNamespace);
-            $episode->number &&
-                $item->addChild('episode', (string) $episode->number, $podcastNamespace);
+                $item->addChild('season', (string) $episode->season_number, RssFeed::ITUNES_NAMESPACE);
+            $item->addChild('episodeType', $episode->type, RssFeed::ITUNES_NAMESPACE);
+
+            // If episode is of type trailer, add podcast:trailer tag on channel level
+            if ($episode->type === 'trailer') {
+                $trailer = $channel->addChild('trailer', $episode->title, RssFeed::PODCAST_NAMESPACE);
+                $trailer->addAttribute('pubdate', $episode->published_at->format(DATE_RFC2822));
+                $trailer->addAttribute(
+                    'url',
+                    $episode->audio_url . ($enclosureParams === '' ? '' : '?' . $enclosureParams),
+                );
+                $trailer->addAttribute('length', (string) $episode->audio->file_size);
+                $trailer->addAttribute('type', $episode->audio->file_mimetype);
+                if ($episode->season_number !== null) {
+                    $trailer->addAttribute('season', (string) $episode->season_number);
+                }
+            }
 
             // add link to episode comments as podcast-activity format
-            $comments = $item->addChild('comments', null, $podcastNamespace);
+            $comments = $item->addChild('comments', null, RssFeed::PODCAST_NAMESPACE);
             $comments->addAttribute('uri', url_to('episode-comments', $podcast->handle, $episode->slug));
             $comments->addAttribute('contentType', 'application/podcast-activity+json');
 
             if ($episode->getPosts()) {
                 $socialInteractUri = $episode->getPosts()[0]
                     ->uri;
-                $socialInteractElement = $item->addChild('socialInteract', null, $podcastNamespace);
+                $socialInteractElement = $item->addChild('socialInteract', null, RssFeed::PODCAST_NAMESPACE);
                 $socialInteractElement->addAttribute('uri', $socialInteractUri);
                 $socialInteractElement->addAttribute('priority', '1');
                 $socialInteractElement->addAttribute('platform', 'castopod');
                 $socialInteractElement->addAttribute('protocol', 'activitypub');
                 $socialInteractElement->addAttribute(
                     'accountId',
-                    "@{$podcast->actor->username}@{$podcast->actor->domain}"
+                    "@{$podcast->actor->username}@{$podcast->actor->domain}",
                 );
                 $socialInteractElement->addAttribute(
                     'pubDate',
                     $episode->getPosts()[0]
-                        ->published_at->format(DateTime::ISO8601)
+                        ->published_at->format(DateTime::ISO8601),
                 );
             }
 
             if ($episode->transcript instanceof Transcript) {
-                $transcriptElement = $item->addChild('transcript', null, $podcastNamespace);
+                $transcriptElement = $item->addChild('transcript', null, RssFeed::PODCAST_NAMESPACE);
                 $transcriptElement->addAttribute('url', $episode->transcript->file_url);
                 $transcriptElement->addAttribute(
                     'type',
                     Mimes::guessTypeFromExtension(
-                        pathinfo($episode->transcript->file_url, PATHINFO_EXTENSION)
+                        pathinfo($episode->transcript->file_url, PATHINFO_EXTENSION),
                     ) ?? 'text/html',
                 );
                 // Castopod only allows for captions (SubRip files)
@@ -383,21 +373,21 @@ if (! function_exists('get_rss_feed')) {
             }
 
             if ($episode->getChapters() instanceof Chapters) {
-                $chaptersElement = $item->addChild('chapters', null, $podcastNamespace);
+                $chaptersElement = $item->addChild('chapters', null, RssFeed::PODCAST_NAMESPACE);
                 $chaptersElement->addAttribute('url', $episode->chapters->file_url);
                 $chaptersElement->addAttribute('type', 'application/json+chapters');
             }
 
             foreach ($episode->soundbites as $soundbite) {
                 // TODO: differentiate video from soundbites?
-                $soundbiteElement = $item->addChild('soundbite', $soundbite->title, $podcastNamespace);
+                $soundbiteElement = $item->addChild('soundbite', $soundbite->title, RssFeed::PODCAST_NAMESPACE);
                 $soundbiteElement->addAttribute('startTime', (string) $soundbite->start_time);
                 $soundbiteElement->addAttribute('duration', (string) round($soundbite->duration, 3));
             }
 
             foreach ($episode->persons as $person) {
                 foreach ($person->roles as $role) {
-                    $personElement = $item->addChild('person', esc($person->full_name), $podcastNamespace);
+                    $personElement = $item->addChild('person', esc($person->full_name), RssFeed::PODCAST_NAMESPACE);
 
                     $personElement->addAttribute(
                         'role',
@@ -418,14 +408,10 @@ if (! function_exists('get_rss_feed')) {
             }
 
             if ($episode->is_blocked) {
-                $item->addChild('block', 'Yes', $itunesNamespace);
+                $item->addChild('block', 'Yes', RssFeed::ITUNES_NAMESPACE);
             }
 
-            if ($episode->custom_rss !== null) {
-                array_to_rss([
-                    'elements' => $episode->custom_rss,
-                ], $item);
-            }
+            $plugins->rssAfterItem($episode, $item);
         }
 
         return $rss->asXML();
@@ -436,11 +422,9 @@ if (! function_exists('add_category_tag')) {
     /**
      * Adds <itunes:category> and <category> tags to node for a given category
      */
-    function add_category_tag(SimpleXMLElement $node, Category $category): void
+    function add_category_tag(RssFeed $node, Category $category): void
     {
-        $itunesNamespace = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
-
-        $itunesCategory = $node->addChild('category', null, $itunesNamespace);
+        $itunesCategory = $node->addChild('category', null, RssFeed::ITUNES_NAMESPACE);
         $itunesCategory->addAttribute(
             'text',
             $category->parent instanceof Category
@@ -449,7 +433,7 @@ if (! function_exists('add_category_tag')) {
         );
 
         if ($category->parent instanceof Category) {
-            $itunesCategoryChild = $itunesCategory->addChild('category', null, $itunesNamespace);
+            $itunesCategoryChild = $itunesCategory->addChild('category', null, RssFeed::ITUNES_NAMESPACE);
             $itunesCategoryChild->addAttribute('text', $category->apple_category);
             $node->addChild('category', $category->parent->apple_category);
         }
@@ -457,71 +441,3 @@ if (! function_exists('add_category_tag')) {
         $node->addChild('category', $category->apple_category);
     }
 }
-
-if (! function_exists('rss_to_array')) {
-    /**
-     * Converts XML to array
-     *
-     * FIXME: param should be SimpleRSSElement
-     *
-     * @return array<string, mixed>
-     */
-    function rss_to_array(SimpleXMLElement $rssNode): array
-    {
-        $nameSpaces = ['', 'http://www.itunes.com/dtds/podcast-1.0.dtd', 'https://podcastindex.org/namespace/1.0'];
-        $arrayNode = [];
-        $arrayNode['name'] = $rssNode->getName();
-        $arrayNode['namespace'] = $rssNode->getNamespaces(false);
-        foreach ($rssNode->attributes() as $key => $value) {
-            $arrayNode['attributes'][$key] = (string) $value;
-        }
-
-        $textcontent = trim((string) $rssNode);
-        if (strlen($textcontent) > 0) {
-            $arrayNode['content'] = $textcontent;
-        }
-
-        foreach ($nameSpaces as $currentNameSpace) {
-            foreach ($rssNode->children($currentNameSpace) as $childXmlNode) {
-                $arrayNode['elements'][] = rss_to_array($childXmlNode);
-            }
-        }
-
-        return $arrayNode;
-    }
-}
-
-if (! function_exists('array_to_rss')) {
-    /**
-     * Inserts array (converted to XML node) in XML node
-     *
-     * @param array<string, mixed> $arrayNode
-     * @param SimpleRSSElement $xmlNode The XML parent node where this arrayNode should be attached
-     */
-    function array_to_rss(array $arrayNode, SimpleRSSElement &$xmlNode): SimpleRSSElement
-    {
-        if (array_key_exists('elements', $arrayNode)) {
-            foreach ($arrayNode['elements'] as $childArrayNode) {
-                $childXmlNode = $xmlNode->addChild(
-                    $childArrayNode['name'],
-                    $childArrayNode['content'] ?? null,
-                    $childArrayNode['namespace'] === []
-                        ? null
-                        : current($childArrayNode['namespace'])
-                );
-                if (array_key_exists('attributes', $childArrayNode)) {
-                    foreach (
-                        $childArrayNode['attributes']
-                        as $attributeKey => $attributeValue
-                    ) {
-                        $childXmlNode->addAttribute($attributeKey, $attributeValue);
-                    }
-                }
-
-                array_to_rss($childArrayNode, $childXmlNode);
-            }
-        }
-
-        return $xmlNode;
-    }
-}

app/Helpers/seo_helper.php

@@ -8,21 +8,19 @@ use App\Entities\EpisodeComment;
 use App\Entities\Page;
 use App\Entities\Podcast;
 use App\Entities\Post;
-use Config\Embed;
-use Config\Images;
-use Melbahja\Seo\MetaTags;
+use App\Libraries\HtmlHead;
 use Melbahja\Seo\Schema;
 use Melbahja\Seo\Schema\Thing;
 use Modules\Fediverse\Entities\PreviewCard;
 
 /**
- * @copyright  2021 Ad Aures
+ * @copyright  2024 Ad Aures
  * @license    https://www.gnu.org/licenses/agpl-3.0.en.html AGPL3
  * @link       https://castopod.org/
  */
 
-if (! function_exists('get_podcast_metatags')) {
-    function get_podcast_metatags(Podcast $podcast, string $page): string
+if (! function_exists('set_podcast_metatags')) {
+    function set_podcast_metatags(Podcast $podcast, string $page): void
     {
         $category = '';
         if ($podcast->category->parent_id !== null) {
@@ -47,38 +45,33 @@ if (! function_exists('get_podcast_metatags')) {
                 'publisher'   => $podcast->publisher,
                 'inLanguage'  => $podcast->language_code,
                 'genre'       => $category,
-            ])
+            ]),
         );
 
-        $metatags = new MetaTags();
+        /** @var HtmlHead $head */
+        $head = service('html_head');
 
-        $metatags
-            ->title($podcast->title . ' (@' . $podcast->handle . ') • ' . lang('Podcast.' . $page))
+        $head
+            ->title(sprintf('%s (@%s) • %s', $podcast->title, $podcast->handle, lang('Podcast.' . $page)))
             ->description(esc($podcast->description))
             ->image((string) $podcast->cover->og_url)
             ->canonical((string) current_url())
-            ->og('image:width', (string) config(Images::class)->podcastCoverSizes['og']['width'])
-            ->og('image:height', (string) config(Images::class)->podcastCoverSizes['og']['height'])
+            ->og('image:width', (string) config('Images')->podcastCoverSizes['og']['width'])
+            ->og('image:height', (string) config('Images')->podcastCoverSizes['og']['height'])
             ->og('locale', $podcast->language_code)
             ->og('site_name', esc(service('settings')->get('App.siteName')))
-            ->push('link', [
+            ->tag('link', null, [
                 'rel'  => 'alternate',
                 'type' => 'application/activity+json',
                 'href' => url_to('podcast-activity', esc($podcast->handle)),
-            ]);
-
-        if ($podcast->payment_pointer) {
-            $metatags->meta('monetization', $podcast->payment_pointer);
-        }
-
-        return '<link type="application/rss+xml" rel="alternate" title="' . esc(
-            $podcast->title
-        ) . '" href="' . $podcast->feed_url . '" />' . PHP_EOL . $metatags->__toString() . PHP_EOL . $schema->__toString();
+            ])->appendRawContent('<link type="application/rss+xml" rel="alternate" title="' . esc(
+                $podcast->title,
+            ) . '" href="' . $podcast->feed_url . '" />' . $schema);
     }
 }
 
-if (! function_exists('get_episode_metatags')) {
-    function get_episode_metatags(Episode $episode): string
+if (! function_exists('set_episode_metatags')) {
+    function set_episode_metatags(Episode $episode): void
     {
         $schema = new Schema(
             new Thing('PodcastEpisode', [
@@ -86,7 +79,7 @@ if (! function_exists('get_episode_metatags')) {
                 'name'            => $episode->title,
                 'image'           => $episode->cover->feed_url,
                 'description'     => $episode->description,
-                'datePublished'   => $episode->published_at->format(DATE_ISO8601),
+                'datePublished'   => $episode->published_at->format(DATE_ATOM),
                 'timeRequired'    => iso8601_duration($episode->audio->duration),
                 'duration'        => iso8601_duration($episode->audio->duration),
                 'associatedMedia' => new Thing('MediaObject', [
@@ -96,55 +89,51 @@ if (! function_exists('get_episode_metatags')) {
                     'name' => $episode->podcast->title,
                     'url'  => $episode->podcast->link,
                 ]),
-            ])
+            ]),
         );
 
-        $metatags = new MetaTags();
+        /** @var HtmlHead $head */
+        $head = service('html_head');
 
-        $metatags
+        $head
             ->title($episode->title)
             ->description(esc($episode->description))
             ->image((string) $episode->cover->og_url, 'player')
             ->canonical($episode->link)
             ->og('site_name', esc(service('settings')->get('App.siteName')))
-            ->og('image:width', (string) config(Images::class)->podcastCoverSizes['og']['width'])
-            ->og('image:height', (string) config(Images::class)->podcastCoverSizes['og']['height'])
+            ->og('image:width', (string) config('Images')->podcastCoverSizes['og']['width'])
+            ->og('image:height', (string) config('Images')->podcastCoverSizes['og']['height'])
             ->og('locale', $episode->podcast->language_code)
             ->og('audio', $episode->audio_opengraph_url)
             ->og('audio:type', $episode->audio->file_mimetype)
-            ->meta('article:published_time', $episode->published_at->format(DATE_ISO8601))
-            ->meta('article:modified_time', $episode->updated_at->format(DATE_ISO8601))
+            ->meta('article:published_time', $episode->published_at->format(DATE_ATOM))
+            ->meta('article:modified_time', $episode->updated_at->format(DATE_ATOM))
             ->twitter('audio:partner', $episode->podcast->publisher ?? '')
             ->twitter('audio:artist_name', esc($episode->podcast->owner_name))
             ->twitter('player', $episode->getEmbedUrl('light'))
-            ->twitter('player:width', (string) config(Embed::class)->width)
-            ->twitter('player:height', (string) config(Embed::class)->height)
-            ->push('link', [
+            ->twitter('player:width', (string) config('Embed')->width)
+            ->twitter('player:height', (string) config('Embed')->height)
+            ->tag('link', null, [
                 'rel'  => 'alternate',
                 'type' => 'application/activity+json',
-                'href' => url_to('episode', $episode->podcast->handle, $episode->slug),
-            ]);
-
-        if ($episode->podcast->payment_pointer) {
-            $metatags->meta('monetization', $episode->podcast->payment_pointer);
-        }
-
-        return $metatags->__toString() . PHP_EOL . '<link rel="alternate" type="application/json+oembed" href="' . base_url(
-            route_to('episode-oembed-json', $episode->podcast->handle, $episode->slug)
-        ) . '" title="' . esc(
-            $episode->title
-        ) . ' oEmbed json" />' . PHP_EOL . '<link rel="alternate" type="text/xml+oembed" href="' . base_url(
-            route_to('episode-oembed-xml', $episode->podcast->handle, $episode->slug)
-        ) . '" title="' . esc($episode->title) . ' oEmbed xml" />' . PHP_EOL . $schema->__toString();
+                'href' => $episode->link,
+            ])
+            ->appendRawContent('<link rel="alternate" type="application/json+oembed" href="' . base_url(
+                route_to('episode-oembed-json', $episode->podcast->handle, $episode->slug),
+            ) . '" title="' . esc(
+                $episode->title,
+            ) . ' oEmbed json" />' . '<link rel="alternate" type="text/xml+oembed" href="' . base_url(
+                route_to('episode-oembed-xml', $episode->podcast->handle, $episode->slug),
+            ) . '" title="' . esc($episode->title) . ' oEmbed xml" />' . $schema);
     }
 }
 
-if (! function_exists('get_post_metatags')) {
-    function get_post_metatags(Post $post): string
+if (! function_exists('set_post_metatags')) {
+    function set_post_metatags(Post $post): void
     {
         $socialMediaPosting = new Thing('SocialMediaPosting', [
             '@id'           => url_to('post', esc($post->actor->username), $post->id),
-            'datePublished' => $post->published_at->format(DATE_ISO8601),
+            'datePublished' => $post->published_at->format(DATE_ATOM),
             'author'        => new Thing('Person', [
                 'name' => $post->actor->display_name,
                 'url'  => $post->actor->uri,
@@ -172,8 +161,10 @@ if (! function_exists('get_post_metatags')) {
 
         $schema = new Schema($socialMediaPosting);
 
-        $metatags = new MetaTags();
-        $metatags
+        /** @var HtmlHead $head */
+        $head = service('html_head');
+
+        $head
             ->title(lang('Post.title', [
                 'actorDisplayName' => $post->actor->display_name,
             ]))
@@ -181,27 +172,25 @@ if (! function_exists('get_post_metatags')) {
             ->image($post->actor->avatar_image_url)
             ->canonical((string) current_url())
             ->og('site_name', esc(service('settings')->get('App.siteName')))
-            ->push('link', [
+            ->tag('link', null, [
                 'rel'  => 'alternate',
                 'type' => 'application/activity+json',
                 'href' => url_to('post', esc($post->actor->username), $post->id),
-            ]);
-
-        return $metatags->__toString() . PHP_EOL . $schema->__toString();
+            ])->appendRawContent((string) $schema);
     }
 }
 
-if (! function_exists('get_episode_comment_metatags')) {
-    function get_episode_comment_metatags(EpisodeComment $episodeComment): string
+if (! function_exists('set_episode_comment_metatags')) {
+    function set_episode_comment_metatags(EpisodeComment $episodeComment): void
     {
         $schema = new Schema(new Thing('SocialMediaPosting', [
             '@id' => url_to(
                 'episode-comment',
                 esc($episodeComment->actor->username),
                 $episodeComment->episode->slug,
-                $episodeComment->id
+                $episodeComment->id,
             ),
-            'datePublished' => $episodeComment->created_at->format(DATE_ISO8601),
+            'datePublished' => $episodeComment->created_at->format(DATE_ATOM),
             'author'        => new Thing('Person', [
                 'name' => $episodeComment->actor->display_name,
                 'url'  => $episodeComment->actor->uri,
@@ -210,8 +199,10 @@ if (! function_exists('get_episode_comment_metatags')) {
             'upvoteCount' => $episodeComment->likes_count,
         ]));
 
-        $metatags = new MetaTags();
-        $metatags
+        /** @var HtmlHead $head */
+        $head = service('html_head');
+
+        $head
             ->title(lang('Comment.title', [
                 'actorDisplayName' => $episodeComment->actor->display_name,
                 'episodeTitle'     => $episodeComment->episode->title,
@@ -220,26 +211,25 @@ if (! function_exists('get_episode_comment_metatags')) {
             ->image($episodeComment->actor->avatar_image_url)
             ->canonical((string) current_url())
             ->og('site_name', esc(service('settings')->get('App.siteName')))
-            ->push('link', [
+            ->tag('link', null, [
                 'rel'  => 'alternate',
                 'type' => 'application/activity+json',
                 'href' => url_to(
                     'episode-comment',
                     $episodeComment->actor->username,
                     $episodeComment->episode->slug,
-                    $episodeComment->id
+                    $episodeComment->id,
                 ),
-            ]);
-
-        return $metatags->__toString() . PHP_EOL . $schema->__toString();
+            ])->appendRawContent((string) $schema);
     }
 }
 
-if (! function_exists('get_follow_metatags')) {
-    function get_follow_metatags(Actor $actor): string
+if (! function_exists('set_follow_metatags')) {
+    function set_follow_metatags(Actor $actor): void
     {
-        $metatags = new MetaTags();
-        $metatags
+        /** @var HtmlHead $head */
+        $head = service('html_head');
+        $head
             ->title(lang('Podcast.followTitle', [
                 'actorDisplayName' => $actor->display_name,
             ]))
@@ -247,16 +237,15 @@ if (! function_exists('get_follow_metatags')) {
             ->image($actor->avatar_image_url)
             ->canonical((string) current_url())
             ->og('site_name', esc(service('settings')->get('App.siteName')));
-
-        return $metatags->__toString();
     }
 }
 
-if (! function_exists('get_remote_actions_metatags')) {
-    function get_remote_actions_metatags(Post $post, string $action): string
+if (! function_exists('set_remote_actions_metatags')) {
+    function set_remote_actions_metatags(Post $post, string $action): void
     {
-        $metatags = new MetaTags();
-        $metatags
+        /** @var HtmlHead $head */
+        $head = service('html_head');
+        $head
             ->title(lang('Fediverse.' . $action . '.title', [
                 'actorDisplayName' => $post->actor->display_name,
             ],))
@@ -264,42 +253,40 @@ if (! function_exists('get_remote_actions_metatags')) {
             ->image($post->actor->avatar_image_url)
             ->canonical((string) current_url())
             ->og('site_name', esc(service('settings')->get('App.siteName')));
-
-        return $metatags->__toString();
     }
 }
 
-if (! function_exists('get_home_metatags')) {
-    function get_home_metatags(): string
+if (! function_exists('set_home_metatags')) {
+    function set_home_metatags(): void
     {
-        $metatags = new MetaTags();
-        $metatags
+        /** @var HtmlHead $head */
+        $head = service('html_head');
+        $head
             ->title(service('settings')->get('App.siteName'))
             ->description(esc(service('settings')->get('App.siteDescription')))
             ->image(get_site_icon_url('512'))
             ->canonical((string) current_url())
             ->og('site_name', esc(service('settings')->get('App.siteName')));
 
-        return $metatags->__toString();
     }
 }
 
-if (! function_exists('get_page_metatags')) {
-    function get_page_metatags(Page $page): string
+if (! function_exists('set_page_metatags')) {
+    function set_page_metatags(Page $page): void
     {
-        $metatags = new MetaTags();
-        $metatags
+        /** @var HtmlHead $head */
+        $head = service('html_head');
+        $head
             ->title(
                 $page->title . service('settings')->get('App.siteTitleSeparator') . service(
-                    'settings'
-                )->get('App.siteName')
+                    'settings',
+                )->get('App.siteName'),
             )
             ->description(esc(service('settings')->get('App.siteDescription')))
             ->image(get_site_icon_url('512'))
             ->canonical((string) current_url())
             ->og('site_name', esc(service('settings')->get('App.siteName')));
 
-        return $metatags->__toString();
     }
 }
 

app/Helpers/svg_helper.php

@@ -8,39 +8,6 @@ declare(strict_types=1);
  * @link       https://castopod.org/
  */
 
-if (! function_exists('icon')) {
-    /**
-     * Returns the inline svg icon
-     *
-     * @param  string $name name of the icon file without the .svg extension
-     * @param  string $class to be added to the svg string
-     * @param string|null $type type of icon to be added
-     * @return string svg contents
-     */
-    function icon(string $name, string $class = '', string $type = null): string
-    {
-        if ($type !== null) {
-            $name = $type . '/' . $name;
-        }
-
-        try {
-            $svgContents = file_get_contents('assets/icons/' . $name . '.svg');
-        } catch (Exception) {
-            if ($type !== null) {
-                return icon('default', $class, $type);
-            }
-
-            return '□';
-        }
-
-        if ($class !== '') {
-            return str_replace('<svg', '<svg class="' . $class . '"', $svgContents);
-        }
-
-        return $svgContents;
-    }
-}
-
 if (! function_exists('svg')) {
     /**
      * Returns the inline svg image