diff --git a/app/Controllers/FeedController.php b/app/Controllers/FeedController.php index 4d646bd4..11b54ddd 100644 --- a/app/Controllers/FeedController.php +++ b/app/Controllers/FeedController.php @@ -33,14 +33,25 @@ class FeedController extends Controller public function index(string $podcastHandle): ResponseInterface { - helper(['rss', 'premium_podcasts', 'misc']); - $podcast = (new PodcastModel())->where('handle', $podcastHandle) ->first(); if (! $podcast instanceof Podcast) { throw PageNotFoundException::forPageNotFound(); } + // 301 redirect to new feed? + $redirectToNewFeed = service('settings') + ->get('Podcast.redirect_to_new_feed', 'podcast:' . $podcast->id); + + if ($redirectToNewFeed && $podcast->new_feed_url !== null && filter_var( + $podcast->new_feed_url, + FILTER_VALIDATE_URL + ) && $podcast->new_feed_url !== current_url()) { + return redirect()->to($podcast->new_feed_url, 301); + } + + helper(['rss', 'premium_podcasts', 'misc']); + $service = null; try { $service = UserAgentsRSS::find(service('superglobals')->server('HTTP_USER_AGENT')); diff --git a/modules/Admin/Controllers/PodcastController.php b/modules/Admin/Controllers/PodcastController.php index aa8c726f..67c1596d 100644 --- a/modules/Admin/Controllers/PodcastController.php +++ b/modules/Admin/Controllers/PodcastController.php @@ -367,6 +367,14 @@ class PodcastController extends BaseController 'podcast:' . $this->podcast->id ); + // New feed url redirect + service('settings') + ->set( + 'Podcast.redirect_to_new_feed', + $this->request->getPost('redirect_to_new_feed') === 'yes', + 'podcast:' . $this->podcast->id + ); + $db->transComplete(); return redirect()->route('podcast-edit', [$this->podcast->id])->with( diff --git a/modules/Admin/Language/en/Podcast.php b/modules/Admin/Language/en/Podcast.php index ff0daebc..ac1aae77 100644 --- a/modules/Admin/Language/en/Podcast.php +++ b/modules/Admin/Language/en/Podcast.php @@ -143,6 +143,8 @@ return [ 'verify_txt_helper' => 'This text is injected into a tag.', 'new_feed_url' => 'New feed URL', 'new_feed_url_hint' => 'Use this field when you move to another domain or podcast hosting platform. By default, the value is set to the current RSS URL if the podcast is imported.', + 'redirect_to_new_feed' => 'Automatically redirect to new feed (301 redirect)', + 'redirect_to_new_feed_hint' => 'Check this when migrating your Castopod RSS feed to the new feed url set above. To ensure followers receive your most recent episodes from the new feed URL, maintain this redirect and the tag in your new feed for at least four weeks.', 'old_feed_url' => 'Old feed URL', 'partnership' => 'Partnership', 'partner_id' => 'ID', diff --git a/themes/cp_admin/podcast/edit.php b/themes/cp_admin/podcast/edit.php index d38bc5a8..85c94fae 100644 --- a/themes/cp_admin/podcast/edit.php +++ b/themes/cp_admin/podcast/edit.php @@ -262,6 +262,10 @@ label="" hint="" value="new_feed_url) ?>" /> + + +