diff options
author | Alecks Gates <agates@mail.agates.io> | 2023-05-22 09:00:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-22 16:00:05 +0200 |
commit | cb0eda5602a21d1626a7face32de6153ed07b5f9 (patch) | |
tree | d6a7a4e31c7267c130871ac8e3beb42994271c20 /server/lib | |
parent | 3f0ceab06e5320f62f593c49daa30d963dbc36f9 (diff) | |
download | PeerTube-cb0eda5602a21d1626a7face32de6153ed07b5f9.tar.gz PeerTube-cb0eda5602a21d1626a7face32de6153ed07b5f9.tar.zst PeerTube-cb0eda5602a21d1626a7face32de6153ed07b5f9.zip |
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 <me@florianbigard.com>
Diffstat (limited to 'server/lib')
-rw-r--r-- | server/lib/blocklist.ts | 4 | ||||
-rw-r--r-- | server/lib/client-html.ts | 6 | ||||
-rw-r--r-- | server/lib/files-cache/videos-preview-cache.ts | 2 | ||||
-rw-r--r-- | server/lib/internal-event-emitter.ts | 35 | ||||
-rw-r--r-- | server/lib/live/live-manager.ts | 4 | ||||
-rw-r--r-- | server/lib/plugins/plugin-helpers-builder.ts | 2 |
6 files changed, 46 insertions, 7 deletions
diff --git a/server/lib/blocklist.ts b/server/lib/blocklist.ts index a11b717b5..009e229ce 100644 --- a/server/lib/blocklist.ts +++ b/server/lib/blocklist.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { sequelizeTypescript } from '@server/initializers/database' | 1 | import { sequelizeTypescript } from '@server/initializers/database' |
2 | import { getServerActor } from '@server/models/application/application' | 2 | import { getServerActor } from '@server/models/application/application' |
3 | import { MAccountBlocklist, MAccountId, MAccountServer, MServerBlocklist } from '@server/types/models' | 3 | import { MAccountBlocklist, MAccountId, MAccountHost, MServerBlocklist } from '@server/types/models' |
4 | import { AccountBlocklistModel } from '../models/account/account-blocklist' | 4 | import { AccountBlocklistModel } from '../models/account/account-blocklist' |
5 | import { ServerBlocklistModel } from '../models/server/server-blocklist' | 5 | import { ServerBlocklistModel } from '../models/server/server-blocklist' |
6 | 6 | ||
@@ -34,7 +34,7 @@ function removeServerFromBlocklist (serverBlock: MServerBlocklist) { | |||
34 | }) | 34 | }) |
35 | } | 35 | } |
36 | 36 | ||
37 | async function isBlockedByServerOrAccount (targetAccount: MAccountServer, userAccount?: MAccountId) { | 37 | async function isBlockedByServerOrAccount (targetAccount: MAccountHost, userAccount?: MAccountId) { |
38 | const serverAccountId = (await getServerActor()).Account.id | 38 | const serverAccountId = (await getServerActor()).Account.id |
39 | const sourceAccounts = [ serverAccountId ] | 39 | const sourceAccounts = [ serverAccountId ] |
40 | 40 | ||
diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 058f29f03..18b16bee1 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts | |||
@@ -27,7 +27,7 @@ import { AccountModel } from '../models/account/account' | |||
27 | import { VideoModel } from '../models/video/video' | 27 | import { VideoModel } from '../models/video/video' |
28 | import { VideoChannelModel } from '../models/video/video-channel' | 28 | import { VideoChannelModel } from '../models/video/video-channel' |
29 | import { VideoPlaylistModel } from '../models/video/video-playlist' | 29 | import { VideoPlaylistModel } from '../models/video/video-playlist' |
30 | import { MAccountActor, MChannelActor, MVideo, MVideoPlaylist } from '../types/models' | 30 | import { MAccountHost, MChannelHost, MVideo, MVideoPlaylist } from '../types/models' |
31 | import { getActivityStreamDuration } from './activitypub/activity' | 31 | import { getActivityStreamDuration } from './activitypub/activity' |
32 | import { getBiggestActorImage } from './actor-image' | 32 | import { getBiggestActorImage } from './actor-image' |
33 | import { Hooks } from './plugins/hooks' | 33 | import { Hooks } from './plugins/hooks' |
@@ -260,7 +260,7 @@ class ClientHtml { | |||
260 | } | 260 | } |
261 | 261 | ||
262 | private static async getAccountOrChannelHTMLPage ( | 262 | private static async getAccountOrChannelHTMLPage ( |
263 | loader: () => Promise<MAccountActor | MChannelActor>, | 263 | loader: () => Promise<MAccountHost | MChannelHost>, |
264 | req: express.Request, | 264 | req: express.Request, |
265 | res: express.Response | 265 | res: express.Response |
266 | ) { | 266 | ) { |
@@ -280,7 +280,7 @@ class ClientHtml { | |||
280 | let customHtml = ClientHtml.addTitleTag(html, entity.getDisplayName()) | 280 | let customHtml = ClientHtml.addTitleTag(html, entity.getDisplayName()) |
281 | customHtml = ClientHtml.addDescriptionTag(customHtml, description) | 281 | customHtml = ClientHtml.addDescriptionTag(customHtml, description) |
282 | 282 | ||
283 | const url = entity.getLocalUrl() | 283 | const url = entity.getClientUrl() |
284 | const originUrl = entity.Actor.url | 284 | const originUrl = entity.Actor.url |
285 | const siteName = CONFIG.INSTANCE.NAME | 285 | const siteName = CONFIG.INSTANCE.NAME |
286 | const title = entity.getDisplayName() | 286 | const title = entity.getDisplayName() |
diff --git a/server/lib/files-cache/videos-preview-cache.ts b/server/lib/files-cache/videos-preview-cache.ts index 48d2cb52c..d19c3f4f4 100644 --- a/server/lib/files-cache/videos-preview-cache.ts +++ b/server/lib/files-cache/videos-preview-cache.ts | |||
@@ -37,7 +37,7 @@ class VideosPreviewCache extends AbstractVideoStaticFileCache <string> { | |||
37 | 37 | ||
38 | const preview = video.getPreview() | 38 | const preview = video.getPreview() |
39 | const destPath = join(FILES_CACHE.PREVIEWS.DIRECTORY, preview.filename) | 39 | const destPath = join(FILES_CACHE.PREVIEWS.DIRECTORY, preview.filename) |
40 | const remoteUrl = preview.getFileUrl(video) | 40 | const remoteUrl = preview.getOriginFileUrl(video) |
41 | 41 | ||
42 | try { | 42 | try { |
43 | await doRequestAndSaveToFile(remoteUrl, destPath) | 43 | await doRequestAndSaveToFile(remoteUrl, destPath) |
diff --git a/server/lib/internal-event-emitter.ts b/server/lib/internal-event-emitter.ts new file mode 100644 index 000000000..08b46a5c3 --- /dev/null +++ b/server/lib/internal-event-emitter.ts | |||
@@ -0,0 +1,35 @@ | |||
1 | import { MChannel, MVideo } from '@server/types/models' | ||
2 | import { EventEmitter } from 'events' | ||
3 | |||
4 | export interface PeerTubeInternalEvents { | ||
5 | 'video-created': (options: { video: MVideo }) => void | ||
6 | 'video-updated': (options: { video: MVideo }) => void | ||
7 | 'video-deleted': (options: { video: MVideo }) => void | ||
8 | |||
9 | 'channel-created': (options: { channel: MChannel }) => void | ||
10 | 'channel-updated': (options: { channel: MChannel }) => void | ||
11 | 'channel-deleted': (options: { channel: MChannel }) => void | ||
12 | } | ||
13 | |||
14 | declare interface InternalEventEmitter { | ||
15 | on<U extends keyof PeerTubeInternalEvents>( | ||
16 | event: U, listener: PeerTubeInternalEvents[U] | ||
17 | ): this | ||
18 | |||
19 | emit<U extends keyof PeerTubeInternalEvents>( | ||
20 | event: U, ...args: Parameters<PeerTubeInternalEvents[U]> | ||
21 | ): boolean | ||
22 | } | ||
23 | |||
24 | class InternalEventEmitter extends EventEmitter { | ||
25 | |||
26 | private static instance: InternalEventEmitter | ||
27 | |||
28 | static get Instance () { | ||
29 | return this.instance || (this.instance = new this()) | ||
30 | } | ||
31 | } | ||
32 | |||
33 | export { | ||
34 | InternalEventEmitter | ||
35 | } | ||
diff --git a/server/lib/live/live-manager.ts b/server/lib/live/live-manager.ts index 5c6e69806..acb7af274 100644 --- a/server/lib/live/live-manager.ts +++ b/server/lib/live/live-manager.ts | |||
@@ -399,6 +399,8 @@ class LiveManager { | |||
399 | } | 399 | } |
400 | 400 | ||
401 | PeerTubeSocket.Instance.sendVideoLiveNewState(video) | 401 | PeerTubeSocket.Instance.sendVideoLiveNewState(video) |
402 | |||
403 | Hooks.runAction('action:live.video.state.updated', { video }) | ||
402 | } catch (err) { | 404 | } catch (err) { |
403 | logger.error('Cannot save/federate live video %d.', videoId, { err, ...localLTags }) | 405 | logger.error('Cannot save/federate live video %d.', videoId, { err, ...localLTags }) |
404 | } | 406 | } |
@@ -466,6 +468,8 @@ class LiveManager { | |||
466 | PeerTubeSocket.Instance.sendVideoLiveNewState(fullVideo) | 468 | PeerTubeSocket.Instance.sendVideoLiveNewState(fullVideo) |
467 | 469 | ||
468 | await federateVideoIfNeeded(fullVideo, false) | 470 | await federateVideoIfNeeded(fullVideo, false) |
471 | |||
472 | Hooks.runAction('action:live.video.state.updated', { video: fullVideo }) | ||
469 | } catch (err) { | 473 | } catch (err) { |
470 | logger.error('Cannot save/federate new video state of live streaming of video %s.', videoUUID, { err, ...lTags(videoUUID) }) | 474 | logger.error('Cannot save/federate new video state of live streaming of video %s.', videoUUID, { err, ...lTags(videoUUID) }) |
471 | } | 475 | } |
diff --git a/server/lib/plugins/plugin-helpers-builder.ts b/server/lib/plugins/plugin-helpers-builder.ts index 92ef87cca..d235f52c0 100644 --- a/server/lib/plugins/plugin-helpers-builder.ts +++ b/server/lib/plugins/plugin-helpers-builder.ts | |||
@@ -133,7 +133,7 @@ function buildVideosHelpers () { | |||
133 | 133 | ||
134 | const thumbnails = video.Thumbnails.map(t => ({ | 134 | const thumbnails = video.Thumbnails.map(t => ({ |
135 | type: t.type, | 135 | type: t.type, |
136 | url: t.getFileUrl(video), | 136 | url: t.getOriginFileUrl(video), |
137 | path: t.getPath() | 137 | path: t.getPath() |
138 | })) | 138 | })) |
139 | 139 | ||