Fix NSFW policy in my videos list

diff --git a/client/src/app/+my-library/my-videos/my-videos.component.html b/client/src/app/+my-library/my-videos/my-videos.component.html
index 977f7b03b2cd78cf4fd3894f7e2babb8b2b9d49b..5fa4c02eca3ac42733cc8d08fe876f7b7d2a21fc 100644 (file)
--- a/client/src/app/+my-library/my-videos/my-videos.component.html
+++ b/client/src/app/+my-library/my-videos/my-videos.component.html
@@ -35,6 +35,7 @@
   [titlePage]="titlePage"
   [getVideosObservableFunction]="getVideosObservableFunction"
   [ownerDisplayType]="ownerDisplayType"
+  [user]="user"
   #videosSelection
 >
   <ng-template ptTemplate="globalButtons">

diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.ts
index e89bb12e1655be600b744cd2ae7eaeb25a88a4fe..6a2a626082e2e242b0c61638a658d2aadb988525 100644 (file)
--- a/client/src/app/+my-library/my-videos/my-videos.component.ts
+++ b/client/src/app/+my-library/my-videos/my-videos.component.ts
@@ -2,7 +2,7 @@ import { concat, Observable, Subject } from 'rxjs'
 import { debounceTime, tap, toArray } from 'rxjs/operators'
 import { Component, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { AuthService, ComponentPagination, ConfirmService, Notifier, ScreenService, ServerService } from '@app/core'
+import { AuthService, ComponentPagination, ConfirmService, Notifier, ScreenService, ServerService, User, UserService } from '@app/core'
 import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
 import { immutableAssign } from '@app/helpers'
 import { DropdownAction, Video, VideoService } from '@app/shared/shared-main'
@@ -45,6 +45,8 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
   videosSearchChanged = new Subject<string>()
   getVideosObservableFunction = this.getVideosObservable.bind(this)
 
+  user: User
+
   constructor (
     protected router: Router,
     protected serverService: ServerService,
@@ -61,6 +63,8 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook {
   ngOnInit () {
     this.buildActions()
 
+    this.user = this.authService.getUser()
+
     this.videosSearchChanged
       .pipe(debounceTime(500))
       .subscribe(() => {

diff --git a/client/src/app/shared/shared-video-miniature/videos-selection.component.html b/client/src/app/shared/shared-video-miniature/videos-selection.component.html
index 5f5593512d59dd8d8220f20dae029c661b0a1b71..8caeaf0921556d4d2406b6f253563af1a6a7b57a 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/videos-selection.component.html
+++ b/client/src/app/shared/shared-video-miniature/videos-selection.component.html
@@ -10,6 +10,7 @@
     <my-video-miniature
       [video]="video" [displayAsRow]="true" [displayOptions]="miniatureDisplayOptions"
       [displayVideoActions]="false" [ownerDisplayType]="ownerDisplayType"
+      [user]="user"
     ></my-video-miniature>
 
     <!-- Display only once -->

diff --git a/client/src/app/shared/shared-video-miniature/videos-selection.component.ts b/client/src/app/shared/shared-video-miniature/videos-selection.component.ts
index ef59975d4e14a0ea48ba6195f38e1416b6d52e22..ca1cf22640c7635d06a3f6668e710c25ef154887 100644 (file)
--- a/client/src/app/shared/shared-video-miniature/videos-selection.component.ts
+++ b/client/src/app/shared/shared-video-miniature/videos-selection.component.ts
@@ -13,7 +13,7 @@ import {
   TemplateRef
 } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { AuthService, ComponentPagination, LocalStorageService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
+import { AuthService, ComponentPagination, LocalStorageService, Notifier, ScreenService, ServerService, User, UserService } from '@app/core'
 import { ResultList, VideoSortField } from '@shared/models'
 import { PeerTubeTemplateDirective, Video } from '../shared-main'
 import { AbstractVideoList } from './abstract-video-list'
@@ -27,6 +27,7 @@ export type SelectionType = { [ id: number ]: boolean }
   styleUrls: [ './videos-selection.component.scss' ]
 })
 export class VideosSelectionComponent extends AbstractVideoList implements OnInit, OnDestroy, AfterContentInit {
+  @Input() user: User
   @Input() pagination: ComponentPagination
   @Input() titlePage: string
   @Input() miniatureDisplayOptions: MiniatureDisplayOptions