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 f93d41110..e51302f7c 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
@@ -7,6 +7,9 @@
Profile
+Video settings
+
+
Notifications
@@ -16,8 +19,5 @@
Email
-Video settings
-
-
Danger zone
diff --git a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
index 049119fa8..2796dd2db 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html
@@ -15,6 +15,21 @@
+
+
+ languageItems: SelectItem[] = []
+
constructor (
protected formValidatorService: FormValidatorService,
private authService: AuthService,
private notifier: Notifier,
private userService: UserService,
+ private serverService: ServerService,
private i18n: I18n
) {
super()
@@ -30,31 +35,60 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
this.buildForm({
nsfwPolicy: null,
webTorrentEnabled: null,
- autoPlayVideo: null
+ autoPlayVideo: null,
+ videoLanguages: null
})
- this.userInformationLoaded.subscribe(() => {
- this.form.patchValue({
- nsfwPolicy: this.user.nsfwPolicy,
- webTorrentEnabled: this.user.webTorrentEnabled,
- autoPlayVideo: this.user.autoPlayVideo === true
- })
- })
+ this.serverService.videoLanguagesLoaded
+ .pipe(switchMap(() => this.userInformationLoaded))
+ .subscribe(() => {
+ const languages = this.serverService.getVideoLanguages()
+
+ this.languageItems = [ { label: this.i18n('Unknown language'), value: '_unknown' } ]
+ this.languageItems = this.languageItems
+ .concat(languages.map(l => ({ label: l.label, value: l.id })))
+
+ const videoLanguages = this.user.videoLanguages
+ ? this.user.videoLanguages
+ : this.languageItems.map(l => l.value)
+
+ this.form.patchValue({
+ nsfwPolicy: this.user.nsfwPolicy,
+ webTorrentEnabled: this.user.webTorrentEnabled,
+ autoPlayVideo: this.user.autoPlayVideo === true,
+ videoLanguages
+ })
+ })
}
updateDetails () {
const nsfwPolicy = this.form.value['nsfwPolicy']
const webTorrentEnabled = this.form.value['webTorrentEnabled']
const autoPlayVideo = this.form.value['autoPlayVideo']
+
+ let videoLanguages: string[] = this.form.value['videoLanguages']
+ if (Array.isArray(videoLanguages)) {
+ if (videoLanguages.length === this.languageItems.length) {
+ videoLanguages = null // null means "All"
+ } else if (videoLanguages.length > 20) {
+ this.notifier.error('Too many languages are enabled. Please enable them all or stay below 20 enabled languages.')
+ return
+ } else if (videoLanguages.length === 0) {
+ this.notifier.error('You need to enabled at least 1 video language.')
+ return
+ }
+ }
+
const details: UserUpdateMe = {
nsfwPolicy,
webTorrentEnabled,
- autoPlayVideo
+ autoPlayVideo,
+ videoLanguages
}
this.userService.updateMyProfile(details).subscribe(
() => {
- this.notifier.success(this.i18n('Information updated.'))
+ this.notifier.success(this.i18n('Video settings updated.'))
this.authService.refreshUserInformation()
},
@@ -62,4 +96,12 @@ export class MyAccountVideoSettingsComponent extends FormReactive implements OnI
err => this.notifier.error(err.message)
)
}
+
+ getDefaultVideoLanguageLabel () {
+ return this.i18n('No language')
+ }
+
+ getSelectedVideoLanguageLabel () {
+ return this.i18n('{{\'{0} languages selected')
+ }
}
diff --git a/client/src/app/+my-account/my-account.module.ts b/client/src/app/+my-account/my-account.module.ts
index ca5b1f7cb..aeda637c2 100644
--- a/client/src/app/+my-account/my-account.module.ts
+++ b/client/src/app/+my-account/my-account.module.ts
@@ -25,18 +25,13 @@ import { MyAccountServerBlocklistComponent } from '@app/+my-account/my-account-b
import { MyAccountHistoryComponent } from '@app/+my-account/my-account-history/my-account-history.component'
import { MyAccountNotificationsComponent } from '@app/+my-account/my-account-notifications/my-account-notifications.component'
import { MyAccountNotificationPreferencesComponent } from '@app/+my-account/my-account-settings/my-account-notification-preferences'
-import {
- MyAccountVideoPlaylistCreateComponent
-} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component'
-import {
- MyAccountVideoPlaylistUpdateComponent
-} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component'
+import { MyAccountVideoPlaylistCreateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-create.component'
+import { MyAccountVideoPlaylistUpdateComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-update.component'
import { MyAccountVideoPlaylistsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlists.component'
-import {
- MyAccountVideoPlaylistElementsComponent
-} from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
+import { MyAccountVideoPlaylistElementsComponent } from '@app/+my-account/my-account-video-playlists/my-account-video-playlist-elements.component'
import { DragDropModule } from '@angular/cdk/drag-drop'
import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-settings/my-account-change-email'
+import { MultiSelectModule } from 'primeng/primeng'
@NgModule({
imports: [
@@ -46,7 +41,8 @@ import { MyAccountChangeEmailComponent } from '@app/+my-account/my-account-setti
SharedModule,
TableModule,
InputSwitchModule,
- DragDropModule
+ DragDropModule,
+ MultiSelectModule
],
declarations: [
diff --git a/client/src/app/shared/users/user.model.ts b/client/src/app/shared/users/user.model.ts
index 14d13959a..95a6ce9f9 100644
--- a/client/src/app/shared/users/user.model.ts
+++ b/client/src/app/shared/users/user.model.ts
@@ -18,6 +18,7 @@ export class User implements UserServerModel {
webTorrentEnabled: boolean
autoPlayVideo: boolean
videosHistoryEnabled: boolean
+ videoLanguages: string[]
videoQuota: number
videoQuotaDaily: number
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index dc8f9cda9..cf4b5ef8e 100644
--- a/client/src/app/shared/video/abstract-video-list.ts
+++ b/client/src/app/shared/video/abstract-video-list.ts
@@ -1,7 +1,7 @@
-import { debounceTime } from 'rxjs/operators'
+import { debounceTime, first, tap } from 'rxjs/operators'
import { OnDestroy, OnInit } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
-import { fromEvent, Observable, Subscription } from 'rxjs'
+import { fromEvent, Observable, of, Subscription } from 'rxjs'
import { AuthService } from '../../core/auth'
import { ComponentPagination } from '../rest/component-pagination.model'
import { VideoSortField } from './sort-field.type'
@@ -32,18 +32,20 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
sort: VideoSortField = '-publishedAt'
categoryOneOf?: number
+ languageOneOf?: string[]
defaultSort: VideoSortField = '-publishedAt'
syndicationItems: Syndication[] = []
loadOnInit = true
- videos: Video[] = []
+ useUserVideoLanguagePreferences = false
ownerDisplayType: OwnerDisplayType = 'account'
displayModerationBlock = false
titleTooltip: string
displayVideoActions = true
groupByDate = false
+ videos: Video[] = []
disabled = false
displayOptions: MiniatureDisplayOptions = {
@@ -98,7 +100,12 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
.subscribe(() => this.calcPageSizes())
this.calcPageSizes()
- if (this.loadOnInit === true) this.loadMoreVideos()
+
+ const loadUserObservable = this.loadUserVideoLanguagesIfNeeded()
+
+ if (this.loadOnInit === true) {
+ loadUserObservable.subscribe(() => this.loadMoreVideos())
+ }
}
ngOnDestroy () {
@@ -245,4 +252,16 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
this.router.navigate([ path ], { queryParams, replaceUrl: true, queryParamsHandling: 'merge' })
}
+
+ private loadUserVideoLanguagesIfNeeded () {
+ if (!this.authService.isLoggedIn() || !this.useUserVideoLanguagePreferences) {
+ return of(true)
+ }
+
+ return this.authService.userInformationLoaded
+ .pipe(
+ first(),
+ tap(() => this.languageOneOf = this.user.videoLanguages)
+ )
+ }
}
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts
index ef489648c..871bc9e46 100644
--- a/client/src/app/shared/video/video.service.ts
+++ b/client/src/app/shared/video/video.service.ts
@@ -35,12 +35,13 @@ import { VideoPlaylist } from '@app/shared/video-playlist/video-playlist.model'
import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service'
export interface VideosProvider {
- getVideos (
+ getVideos (parameters: {
videoPagination: ComponentPagination,
sort: VideoSortField,
filter?: VideoFilter,
- categoryOneOf?: number
- ): Observable<{ videos: Video[], totalVideos: number }>
+ categoryOneOf?: number,
+ languageOneOf?: string[]
+ }): Observable<{ videos: Video[], totalVideos: number }>
}
@Injectable()
@@ -206,12 +207,15 @@ export class VideoService implements VideosProvider {
)
}
- getVideos (
+ getVideos (parameters: {
videoPagination: ComponentPagination,
sort: VideoSortField,
filter?: VideoFilter,
- categoryOneOf?: number
- ): Observable<{ videos: Video[], totalVideos: number }> {
+ categoryOneOf?: number,
+ languageOneOf?: string[]
+ }): Observable<{ videos: Video[], totalVideos: number }> {
+ const { videoPagination, sort, filter, categoryOneOf, languageOneOf } = parameters
+
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
let params = new HttpParams()
@@ -225,6 +229,12 @@ export class VideoService implements VideosProvider {
params = params.set('categoryOneOf', categoryOneOf + '')
}
+ if (languageOneOf) {
+ for (const l of languageOneOf) {
+ params = params.append('languageOneOf[]', l)
+ }
+ }
+
return this.authHttp
.get>(VideoService.BASE_VIDEO_URL, { params })
.pipe(
diff --git a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts b/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts
index 6d7b159da..f975ff6ef 100644
--- a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts
+++ b/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts
@@ -32,7 +32,7 @@ export class RecentVideosRecommendationService implements RecommendationService
private fetchPage (page: number, recommendation: RecommendationInfo): Observable