tilderadio/AzuraCast
4
0
Fork 0
mirror of https://github.com/AzuraCast/AzuraCast.git synced 2024-06-15 05:36:37 +00:00
Code Issues Releases Wiki Activity

Fixes #6879 -- Fix base URI and Podcast RSS feed.

Browse Source
This commit is contained in:
Buster Neece 2024-01-20 21:07:09 -06:00
parent d7b8c59ff9
commit 851de76f30
No known key found for this signature in database
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Controller/Frontend/PublicPages/PodcastFeedAction.php
View File

@ -27,8 +27,6 @@ use MarcW\RssWriter\Extension\Core\Enclosure as RssEnclosure;
use MarcW\RssWriter\Extension\Core\Guid as RssGuid;
use MarcW\RssWriter\Extension\Core\Image as RssImage;
use MarcW\RssWriter\Extension\Core\Item as RssItem;
use MarcW\RssWriter\Extension\DublinCore\DublinCore;
use MarcW\RssWriter\Extension\DublinCore\DublinCoreWriter;
use MarcW\RssWriter\Extension\Itunes\ItunesChannel;
use MarcW\RssWriter\Extension\Itunes\ItunesItem;
use MarcW\RssWriter\Extension\Itunes\ItunesOwner;
@ -119,7 +117,6 @@ final class PodcastFeedAction implements SingleActionInterface
$rssWriter->registerWriter(new SyWriter());
$rssWriter->registerWriter(new SlashWriter());
$rssWriter->registerWriter(new AtomWriter());
$rssWriter->registerWriter(new DublinCoreWriter());
return $rssWriter;
}
@ -140,7 +137,7 @@ final class PodcastFeedAction implements SingleActionInterface
$channelLink = $podcast->getLink();
if (empty($channelLink)) {
$channelLink = $serverRequest->getRouter()->fromHere(
routeName: 'public:podcast:episodes',
routeName: 'public:podcast',
absolute: true
);
}
@ -175,7 +172,6 @@ final class PodcastFeedAction implements SingleActionInterface
->setHref((string)$serverRequest->getUri())
->setType('application/rss+xml')
);
$channel->addExtension(new DublinCore());
return $channel;
}
@ -255,7 +251,11 @@ final class PodcastFeedAction implements SingleActionInterface
}
$rssImage->setUrl($podcastArtworkSrc);
$rssImage->setLink($podcast->getLink());
if (null !== $podcast->getLink()) {
$rssImage->setLink($podcast->getLink());
}
$rssImage->setTitle($podcast->getTitle());
return $rssImage;
@ -277,7 +277,7 @@ final class PodcastFeedAction implements SingleActionInterface
$rssItem = new RssItem();
$rssGuid = new RssGuid();
$rssGuid->setGuid($episode->getId());
$rssGuid->setGuid($episode->getIdRequired());
$rssItem->setGuid($rssGuid);
$rssItem->setTitle($episode->getTitle());
@ -292,7 +292,6 @@ final class PodcastFeedAction implements SingleActionInterface
);
}
$rssItem->setLink($episodeLink);
$publishAtDateTime = (new DateTime())->setTimestamp($episode->getCreatedAt());

4
src/Controller/Frontend/PublicPages/PodcastsAction.php
View File

@ -53,9 +53,7 @@ final class PodcastsAction implements SingleActionInterface
'hide_footer' => true,
],
props: [
'baseUrl' => $router->named('public:index', [
'station_id' => $station->getShortName(),
]),
'baseUrl' => $router->fromHere('public:index'),
],
);
}