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 /client | |
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 'client')
9 files changed, 88 insertions, 5 deletions
diff --git a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts index 235fbec4a..ebb7ed2da 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { forkJoin } from 'rxjs' | 1 | import { forkJoin } from 'rxjs' |
2 | import { tap } from 'rxjs/operators' | 2 | import { tap } from 'rxjs/operators' |
3 | import { Component, OnInit } from '@angular/core' | 3 | import { Component, OnInit } from '@angular/core' |
4 | import { AuthService, ServerService, UserService } from '@app/core' | 4 | import { AuthService, Notifier, ServerService, UserService } from '@app/core' |
5 | import { USER_EMAIL_VALIDATOR, USER_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-validators' | 5 | import { USER_EMAIL_VALIDATOR, USER_PASSWORD_VALIDATOR } from '@app/shared/form-validators/user-validators' |
6 | import { FormReactive, FormReactiveService } from '@app/shared/shared-forms' | 6 | import { FormReactive, FormReactiveService } from '@app/shared/shared-forms' |
7 | import { HttpStatusCode, User } from '@shared/models' | 7 | import { HttpStatusCode, User } from '@shared/models' |
@@ -20,7 +20,8 @@ export class MyAccountChangeEmailComponent extends FormReactive implements OnIni | |||
20 | protected formReactiveService: FormReactiveService, | 20 | protected formReactiveService: FormReactiveService, |
21 | private authService: AuthService, | 21 | private authService: AuthService, |
22 | private userService: UserService, | 22 | private userService: UserService, |
23 | private serverService: ServerService | 23 | private serverService: ServerService, |
24 | private notifier: Notifier | ||
24 | ) { | 25 | ) { |
25 | super() | 26 | super() |
26 | } | 27 | } |
diff --git a/client/src/app/+my-account/my-account-settings/my-account-email-preferences/index.ts b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/index.ts new file mode 100644 index 000000000..20b98e7d8 --- /dev/null +++ b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/index.ts | |||
@@ -0,0 +1 @@ | |||
export * from './my-account-email-preferences.component' | |||
diff --git a/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.html b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.html new file mode 100644 index 000000000..c4fe52743 --- /dev/null +++ b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.html | |||
@@ -0,0 +1,15 @@ | |||
1 | <form role="form" (ngSubmit)="updateEmailPublic()" [formGroup]="form"> | ||
2 | |||
3 | <div class="form-group"> | ||
4 | <my-peertube-checkbox | ||
5 | inputName="email-public" formControlName="email-public" | ||
6 | i18n-labelText labelText="Allow email to be publicly displayed" | ||
7 | > | ||
8 | <ng-container ngProjectAs="description"> | ||
9 | <span i18n>Necessary to claim podcast RSS feeds.</span> | ||
10 | </ng-container> | ||
11 | </my-peertube-checkbox> | ||
12 | </div> | ||
13 | |||
14 | <input class="peertube-button orange-button" type="submit" i18n-value value="Save" [disabled]="!form.valid"> | ||
15 | </form> | ||
diff --git a/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.scss b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.scss new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.scss | |||
diff --git a/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.ts new file mode 100644 index 000000000..7fd59d7c8 --- /dev/null +++ b/client/src/app/+my-account/my-account-settings/my-account-email-preferences/my-account-email-preferences.component.ts | |||
@@ -0,0 +1,51 @@ | |||
1 | import { Subject } from 'rxjs' | ||
2 | import { Component, Input, OnInit } from '@angular/core' | ||
3 | import { Notifier, UserService } from '@app/core' | ||
4 | import { FormReactive, FormReactiveService } from '@app/shared/shared-forms' | ||
5 | import { User, UserUpdateMe } from '@shared/models' | ||
6 | |||
7 | @Component({ | ||
8 | selector: 'my-account-email-preferences', | ||
9 | templateUrl: './my-account-email-preferences.component.html', | ||
10 | styleUrls: [ './my-account-email-preferences.component.scss' ] | ||
11 | }) | ||
12 | export class MyAccountEmailPreferencesComponent extends FormReactive implements OnInit { | ||
13 | @Input() user: User = null | ||
14 | @Input() userInformationLoaded: Subject<any> | ||
15 | |||
16 | constructor ( | ||
17 | protected formReactiveService: FormReactiveService, | ||
18 | private userService: UserService, | ||
19 | private notifier: Notifier | ||
20 | ) { | ||
21 | super() | ||
22 | } | ||
23 | |||
24 | ngOnInit () { | ||
25 | this.buildForm({ | ||
26 | 'email-public': null | ||
27 | }) | ||
28 | |||
29 | this.userInformationLoaded.subscribe(() => { | ||
30 | this.form.patchValue({ 'email-public': this.user.emailPublic }) | ||
31 | }) | ||
32 | } | ||
33 | |||
34 | updateEmailPublic () { | ||
35 | const details: UserUpdateMe = { | ||
36 | emailPublic: this.form.value['email-public'] | ||
37 | } | ||
38 | |||
39 | this.userService.updateMyProfile(details) | ||
40 | .subscribe({ | ||
41 | next: () => { | ||
42 | if (details.emailPublic) this.notifier.success($localize`Email is now public`) | ||
43 | else this.notifier.success($localize`Email is now private`) | ||
44 | |||
45 | this.user.emailPublic = details.emailPublic | ||
46 | }, | ||
47 | |||
48 | error: err => console.log(err.message) | ||
49 | }) | ||
50 | } | ||
51 | } | ||
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html index 666205de6..3986354c1 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html | |||
@@ -68,7 +68,7 @@ | |||
68 | </div> | 68 | </div> |
69 | 69 | ||
70 | <div class="col-12 col-lg-8 col-xl-9"> | 70 | <div class="col-12 col-lg-8 col-xl-9"> |
71 | <my-account-two-factor-button [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-two-factor-button> | 71 | <my-account-two-factor-button [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-two-factor-button> |
72 | </div> | 72 | </div> |
73 | </div> | 73 | </div> |
74 | 74 | ||
@@ -78,6 +78,8 @@ | |||
78 | </div> | 78 | </div> |
79 | 79 | ||
80 | <div class="col-12 col-lg-8 col-xl-9"> | 80 | <div class="col-12 col-lg-8 col-xl-9"> |
81 | <my-account-email-preferences class="d-block mb-5" [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-email-preferences> | ||
82 | |||
81 | <my-account-change-email></my-account-change-email> | 83 | <my-account-change-email></my-account-change-email> |
82 | </div> | 84 | </div> |
83 | </div> | 85 | </div> |
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts index 84b057647..673bd2837 100644 --- a/client/src/app/+my-account/my-account.module.ts +++ b/client/src/app/+my-account/my-account.module.ts | |||
@@ -22,6 +22,7 @@ import { MyAccountRoutingModule } from './my-account-routing.module' | |||
22 | import { MyAccountChangeEmailComponent } from './my-account-settings/my-account-change-email' | 22 | import { MyAccountChangeEmailComponent } from './my-account-settings/my-account-change-email' |
23 | import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component' | 23 | import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component' |
24 | import { MyAccountDangerZoneComponent } from './my-account-settings/my-account-danger-zone' | 24 | import { MyAccountDangerZoneComponent } from './my-account-settings/my-account-danger-zone' |
25 | import { MyAccountEmailPreferencesComponent } from './my-account-settings/my-account-email-preferences' | ||
25 | import { MyAccountNotificationPreferencesComponent } from './my-account-settings/my-account-notification-preferences' | 26 | import { MyAccountNotificationPreferencesComponent } from './my-account-settings/my-account-notification-preferences' |
26 | import { MyAccountProfileComponent } from './my-account-settings/my-account-profile/my-account-profile.component' | 27 | import { MyAccountProfileComponent } from './my-account-settings/my-account-profile/my-account-profile.component' |
27 | import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component' | 28 | import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component' |
@@ -65,7 +66,9 @@ import { MyAccountComponent } from './my-account.component' | |||
65 | MyAccountAbusesListComponent, | 66 | MyAccountAbusesListComponent, |
66 | MyAccountServerBlocklistComponent, | 67 | MyAccountServerBlocklistComponent, |
67 | MyAccountNotificationsComponent, | 68 | MyAccountNotificationsComponent, |
68 | MyAccountNotificationPreferencesComponent | 69 | MyAccountNotificationPreferencesComponent, |
70 | |||
71 | MyAccountEmailPreferencesComponent | ||
69 | ], | 72 | ], |
70 | 73 | ||
71 | exports: [ | 74 | exports: [ |
diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts index 5534bca33..2d783145f 100644 --- a/client/src/app/core/users/user.model.ts +++ b/client/src/app/core/users/user.model.ts | |||
@@ -19,6 +19,7 @@ export class User implements UserServerModel { | |||
19 | pendingEmail: string | null | 19 | pendingEmail: string | null |
20 | 20 | ||
21 | emailVerified: boolean | 21 | emailVerified: boolean |
22 | emailPublic: boolean | ||
22 | nsfwPolicy: NSFWPolicyType | 23 | nsfwPolicy: NSFWPolicyType |
23 | 24 | ||
24 | adminFlags?: UserAdminFlag | 25 | adminFlags?: UserAdminFlag |
diff --git a/client/src/app/shared/shared-main/video/video.service.ts b/client/src/app/shared/shared-main/video/video.service.ts index 152149827..78a49567f 100644 --- a/client/src/app/shared/shared-main/video/video.service.ts +++ b/client/src/app/shared/shared-main/video/video.service.ts | |||
@@ -54,6 +54,7 @@ export type CommonVideoParams = { | |||
54 | export class VideoService { | 54 | export class VideoService { |
55 | static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos' | 55 | static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos' |
56 | static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.' | 56 | static BASE_FEEDS_URL = environment.apiUrl + '/feeds/videos.' |
57 | static PODCAST_FEEDS_URL = environment.apiUrl + '/feeds/podcast/videos.xml' | ||
57 | static BASE_SUBSCRIPTION_FEEDS_URL = environment.apiUrl + '/feeds/subscriptions.' | 58 | static BASE_SUBSCRIPTION_FEEDS_URL = environment.apiUrl + '/feeds/subscriptions.' |
58 | 59 | ||
59 | constructor ( | 60 | constructor ( |
@@ -266,7 +267,15 @@ export class VideoService { | |||
266 | let params = this.restService.addRestGetParams(new HttpParams()) | 267 | let params = this.restService.addRestGetParams(new HttpParams()) |
267 | params = params.set('videoChannelId', videoChannelId.toString()) | 268 | params = params.set('videoChannelId', videoChannelId.toString()) |
268 | 269 | ||
269 | return this.buildBaseFeedUrls(params) | 270 | const feedUrls = this.buildBaseFeedUrls(params) |
271 | |||
272 | feedUrls.push({ | ||
273 | format: FeedFormat.RSS, | ||
274 | label: 'podcast rss 2.0', | ||
275 | url: VideoService.PODCAST_FEEDS_URL + `?videoChannelId=${videoChannelId}` | ||
276 | }) | ||
277 | |||
278 | return feedUrls | ||
270 | } | 279 | } |
271 | 280 | ||
272 | getVideoSubscriptionFeedUrls (accountId: number, feedToken: string) { | 281 | getVideoSubscriptionFeedUrls (accountId: number, feedToken: string) { |