X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccount-videos%2Faccount-videos.component.ts;h=78af2316a78d77452569de560e5fcc93c02bdb01;hb=4d5e572f52e000034abb076e4bf7d7044d704f94;hp=5e3dbb6b386921d161aebe2a46e990347f443b53;hpb=734a5ceb3d04088743d72babcb9b05e6142043f6;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts
index 5e3dbb6b3..78af2316a 100644
--- a/client/src/app/+accounts/account-videos/account-videos.component.ts
+++ b/client/src/app/+accounts/account-videos/account-videos.component.ts
@@ -1,63 +1,62 @@
-import { Component, OnDestroy, OnInit } from '@angular/core'
+import { forkJoin, Subscription } from 'rxjs'
+import { first, tap } from 'rxjs/operators'
+import { Component, ComponentFactoryResolver, OnDestroy, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
-import { Location } from '@angular/common'
-import { immutableAssign } from '@app/shared/misc/utils'
-import { NotificationsService } from 'angular2-notifications'
-import { AuthService } from '../../core/auth'
-import { ConfirmService } from '../../core/confirm'
-import { AbstractVideoList } from '../../shared/video/abstract-video-list'
-import { VideoService } from '../../shared/video/video.service'
-import { Account } from '@app/shared/account/account.model'
-import { AccountService } from '@app/shared/account/account.service'
-import { tap } from 'rxjs/operators'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { Subscription } from 'rxjs'
+import { AuthService, ConfirmService, LocalStorageService, Notifier, ScreenService, ServerService, UserService } from '@app/core'
+import { immutableAssign } from '@app/helpers'
+import { Account, AccountService, VideoService } from '@app/shared/shared-main'
+import { AbstractVideoList } from '@app/shared/shared-video-miniature'
+import { VideoFilter } from '@shared/models'
 
 @Component({
   selector: 'my-account-videos',
-  templateUrl: '../../shared/video/abstract-video-list.html',
+  templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html',
   styleUrls: [
-    '../../shared/video/abstract-video-list.scss',
-    './account-videos.component.scss'
+    '../../shared/shared-video-miniature/abstract-video-list.scss'
   ]
 })
 export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
   titlePage: string
-  marginContent = false // Disable margin
-  currentRoute = '/account/videos'
   loadOnInit = false
+  loadUserVideoPreferences = true
+
+  filter: VideoFilter = null
 
   private account: Account
   private accountSub: Subscription
 
   constructor (
     protected router: Router,
+    protected serverService: ServerService,
     protected route: ActivatedRoute,
     protected authService: AuthService,
-    protected notificationsService: NotificationsService,
+    protected userService: UserService,
+    protected notifier: Notifier,
     protected confirmService: ConfirmService,
-    protected location: Location,
-    protected i18n: I18n,
+    protected screenService: ScreenService,
+    protected storageService: LocalStorageService,
     private accountService: AccountService,
-    private videoService: VideoService
+    private videoService: VideoService,
+    protected cfr: ComponentFactoryResolver
   ) {
     super()
-
-    this.titlePage = this.i18n('Published videos')
   }
 
   ngOnInit () {
     super.ngOnInit()
 
+    this.enableAllFilterIfPossible()
+
     // Parent get the account for us
-    this.accountSub = this.accountService.accountLoaded
-      .subscribe(account => {
-        this.account = account
-        this.currentRoute = '/account/' + this.account.nameWithHost + '/videos'
-
-        this.reloadVideos()
-        this.generateSyndicationList()
-      })
+    this.accountSub = forkJoin([
+      this.accountService.accountLoaded.pipe(first()),
+      this.onUserLoadedSubject.pipe(first())
+    ]).subscribe(([ account ]) => {
+      this.account = account
+
+      this.reloadVideos()
+      this.generateSyndicationList()
+    })
   }
 
   ngOnDestroy () {
@@ -68,17 +67,34 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit,
 
   getVideosObservable (page: number) {
     const newPagination = immutableAssign(this.pagination, { currentPage: page })
+    const options = {
+      account: this.account,
+      videoPagination: newPagination,
+      sort: this.sort,
+      nsfwPolicy: this.nsfwPolicy,
+      videoFilter: this.filter
+    }
 
     return this.videoService
-               .getAccountVideos(this.account, newPagination, this.sort)
+               .getAccountVideos(options)
                .pipe(
-                 tap(({ totalVideos }) => {
-                   this.titlePage = this.i18n('Published {{totalVideos}} videos', { totalVideos })
+                 tap(({ total }) => {
+                   this.titlePage = $localize`Published ${total} videos`
                  })
                )
   }
 
+  toggleModerationDisplay () {
+    this.filter = this.buildLocalFilter(this.filter, null)
+
+    this.reloadVideos()
+  }
+
   generateSyndicationList () {
     this.syndicationItems = this.videoService.getAccountFeedUrls(this.account.id)
   }
+
+  displayAsRow () {
+    return this.screenService.isInMobileView()
+  }
 }