From cb0eda5602a21d1626a7face32de6153ed07b5f9 Mon Sep 17 00:00:00 2001 From: Alecks Gates Date: Mon, 22 May 2023 09:00:05 -0500 Subject: Add Podcast RSS feeds (#5487) * Initial test implementation of Podcast RSS This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option. I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort. * Update to pfeed-podcast 1.2.2 * Initial test implementation of Podcast RSS This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option. I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort. * Update to pfeed-podcast 1.2.2 * Initial test implementation of Podcast RSS This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option. I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort. * Update to pfeed-podcast 1.2.2 * Add correct feed image to RSS channel * Prefer HLS videos for podcast RSS Remove video/stream titles, add optional height attribute to podcast RSS * Prefix podcast RSS images with root server URL * Add optional video query support to include captions * Add transcripts & person images to podcast RSS feed * Prefer webseed/webtorrent files over HLS fragmented mp4s * Experimentally adding podcast fields to basic config page * Add validation for new basic config fields * Don't include "content" in podcast feed, use full description for "description" * Initial test implementation of Podcast RSS This is a pretty simple implementation to add support for The Podcast Namespace in RSS -- instead of affecting the existing RSS implementation, this adds a new UI option. I attempted to retain compatibility with the rest of the RSS feed implementation as much as possible and have created a temporary fork of the "pfeed" library to support this effort. * Update to pfeed-podcast 1.2.2 * Add correct feed image to RSS channel * Prefer HLS videos for podcast RSS Remove video/stream titles, add optional height attribute to podcast RSS * Prefix podcast RSS images with root server URL * Add optional video query support to include captions * Add transcripts & person images to podcast RSS feed * Prefer webseed/webtorrent files over HLS fragmented mp4s * Experimentally adding podcast fields to basic config page * Add validation for new basic config fields * Don't include "content" in podcast feed, use full description for "description" * Add medium/socialInteract to podcast RSS feeds. Use HTML for description * Change base production image to bullseye, install prosody in image * Add liveItem and trackers to Podcast RSS feeds Remove height from alternateEnclosure, replaced with title. * Clear Podcast RSS feed cache when live streams start/end * Upgrade to Node 16 * Refactor clearCacheRoute to use ApiCache * Remove unnecessary type hint * Update dockerfile to node 16, install python-is-python2 * Use new file paths for captions/playlists * Fix legacy videos in RSS after migration to object storage * Improve method of identifying non-fragmented mp4s in podcast RSS feeds * Don't include fragmented MP4s in podcast RSS feeds * Add experimental support for podcast:categories on the podcast RSS item * Fix undefined category when no videos exist Allows for empty feeds to exist (important for feeds that might only go live) * Add support for podcast:locked -- user has to opt in to show their email * Use comma for podcast:categories delimiter * Make cache clearing async * Fix merge, temporarily test with pfeed-podcast * Syntax changes * Add EXT_MIMETYPE constants for captions * Update & fix tests, fix enclosure mimetypes, remove admin email * Add test for podacst:socialInteract * Add filters hooks for podcast customTags * Remove showdown, updated to pfeed-podcast 6.1.2 * Add 'action:api.live-video.state.updated' hook * Avoid assigning undefined category to podcast feeds * Remove nvmrc * Remove comment * Remove unused podcast config * Remove more unused podcast config * Fix MChannelAccountDefault type hint missed in merge * Remove extra line * Re-add newline in config * Fix lint errors for isEmailPublic * Fix thumbnails in podcast feeds * Requested changes based on review * Provide podcast rss 2.0 only on video channels * Misc cleanup for a less messy PR * Lint fixes * Remove pfeed-podcast * Add peertube version to new hooks * Don't use query include, remove TODO * Remove film medium hack * Clear podcast rss cache before video/channel update hooks * Clear podcast rss cache before video uploaded/deleted hooks * Refactor podcast feed cache clearing * Set correct person name from video channel * Styling * Fix tests --------- Co-authored-by: Chocobozzz --- server/types/express.d.ts | 2 ++ server/types/models/account/account.ts | 7 +++---- server/types/models/actor/actor-follow.ts | 4 ++-- server/types/models/actor/actor.ts | 10 +++++++--- server/types/models/video/video-channels.ts | 7 ++++++- server/types/models/video/video.ts | 4 ++-- 6 files changed, 22 insertions(+), 12 deletions(-) (limited to 'server/types') diff --git a/server/types/express.d.ts b/server/types/express.d.ts index a8aeabb3a..510b9f94e 100644 --- a/server/types/express.d.ts +++ b/server/types/express.d.ts @@ -110,6 +110,8 @@ declare module 'express' { locals: { requestStart: number + apicacheGroups: string[] + apicache: { content: string | Buffer write: Writable['write'] diff --git a/server/types/models/account/account.ts b/server/types/models/account/account.ts index 282a2971b..d10b904ab 100644 --- a/server/types/models/account/account.ts +++ b/server/types/models/account/account.ts @@ -8,8 +8,8 @@ import { MActorDefault, MActorDefaultLight, MActorFormattable, + MActorHost, MActorId, - MActorServer, MActorSummary, MActorSummaryFormattable, MActorUrl @@ -68,10 +68,9 @@ export type MAccountActor = MAccount & Use<'Actor', MActor> -// Full actor with server -export type MAccountServer = +export type MAccountHost = MAccount & - Use<'Actor', MActorServer> + Use<'Actor', MActorHost> // ############################################################################ diff --git a/server/types/models/actor/actor-follow.ts b/server/types/models/actor/actor-follow.ts index 338158561..84042e228 100644 --- a/server/types/models/actor/actor-follow.ts +++ b/server/types/models/actor/actor-follow.ts @@ -7,7 +7,7 @@ import { MActorDefaultAccountChannel, MActorDefaultChannelId, MActorFormattable, - MActorHost, + MActorHostOnly, MActorUsername } from './actor' @@ -21,7 +21,7 @@ export type MActorFollow = Omit + Use<'ActorFollowing', MActorUsername & MActorHostOnly> // ############################################################################ diff --git a/server/types/models/actor/actor.ts b/server/types/models/actor/actor.ts index 280256bab..47e7b7091 100644 --- a/server/types/models/actor/actor.ts +++ b/server/types/models/actor/actor.ts @@ -29,7 +29,11 @@ export type MActorLight = Omit // Some association attributes -export type MActorHost = Use<'Server', MServerHost> +export type MActorHostOnly = Use<'Server', MServerHost> +export type MActorHost = + MActorLight & + Use<'Server', MServerHost> + export type MActorRedundancyAllowedOpt = PickWithOpt export type MActorDefaultLight = @@ -68,8 +72,8 @@ export type MActorChannel = export type MActorDefaultAccountChannel = MActorDefault & MActorAccount & MActorChannel -export type MActorServer = - MActor & +export type MActorServerLight = + MActorLight & Use<'Server', MServer> // ############################################################################ diff --git a/server/types/models/video/video-channels.ts b/server/types/models/video/video-channels.ts index af8c2ffe4..57e991494 100644 --- a/server/types/models/video/video-channels.ts +++ b/server/types/models/video/video-channels.ts @@ -21,6 +21,7 @@ import { MActorDefaultLight, MActorFormattable, MActorHost, + MActorHostOnly, MActorLight, MActorSummary, MActorSummaryFormattable, @@ -77,9 +78,13 @@ export type MChannelAccountLight = Use<'Account', MAccountLight> export type MChannelHost = - MChannelId & + MChannel & Use<'Actor', MActorHost> +export type MChannelHostOnly = + MChannelId & + Use<'Actor', MActorHostOnly> + // ############################################################################ // Account associations diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts index d1af53b92..58ae7baad 100644 --- a/server/types/models/video/video.ts +++ b/server/types/models/video/video.ts @@ -13,7 +13,7 @@ import { MChannelAccountSummaryFormattable, MChannelActor, MChannelFormattable, - MChannelHost, + MChannelHostOnly, MChannelUserId } from './video-channels' import { MVideoFile, MVideoFileRedundanciesAll, MVideoFileRedundanciesOpt } from './video-file' @@ -146,7 +146,7 @@ export type MVideoWithChannelActor = export type MVideoWithHost = MVideo & - Use<'VideoChannel', MChannelHost> + Use<'VideoChannel', MChannelHostOnly> export type MVideoFullLight = MVideo & -- cgit v1.2.3