X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fabstract-video-list.ts;h=2926b179b566a2ee2d909705bb20a6e4975960a3;hb=22a73cb879a5cc775d4bec3d72fa9c9cf52e5175;hp=8cf21e9d452f3bb22dba7e763a837e2c95210080;hpb=4e0c179365461e9f1f04339b3d5b32d538fea0c4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts
index 8cf21e9d4..2926b179b 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, Subject, Subscription } from 'rxjs'
 import { AuthService } from '../../core/auth'
 import { ComponentPagination } from '../rest/component-pagination.model'
 import { VideoSortField } from './sort-field.type'
@@ -12,14 +12,15 @@ import { Syndication } from '@app/shared/video/syndication.model'
 import { Notifier, ServerService } from '@app/core'
 import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
 import { I18n } from '@ngx-translate/i18n-polyfill'
-import { isThisMonth, isThisWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date'
+import { isLastMonth, isLastWeek, isToday, isYesterday } from '@shared/core-utils/miscs/date'
+import { ResultList } from '@shared/models'
 
 enum GroupDate {
   UNKNOWN = 0,
   TODAY = 1,
   YESTERDAY = 2,
-  THIS_WEEK = 3,
-  THIS_MONTH = 4,
+  LAST_WEEK = 3,
+  LAST_MONTH = 4,
   OLDER = 5
 }
 
@@ -32,18 +33,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 = {
@@ -56,6 +59,8 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
     blacklistInfo: false
   }
 
+  onDataSubject = new Subject<any[]>()
+
   protected abstract notifier: Notifier
   protected abstract authService: AuthService
   protected abstract route: ActivatedRoute
@@ -71,7 +76,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
   private groupedDateLabels: { [id in GroupDate]: string }
   private groupedDates: { [id: number]: GroupDate } = {}
 
-  abstract getVideosObservable (page: number): Observable<{ videos: Video[], totalVideos: number }>
+  abstract getVideosObservable (page: number): Observable<ResultList<Video>>
 
   abstract generateSyndicationList (): void
 
@@ -84,8 +89,8 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
       [GroupDate.UNKNOWN]: null,
       [GroupDate.TODAY]: this.i18n('Today'),
       [GroupDate.YESTERDAY]: this.i18n('Yesterday'),
-      [GroupDate.THIS_WEEK]: this.i18n('This week'),
-      [GroupDate.THIS_MONTH]: this.i18n('This month'),
+      [GroupDate.LAST_WEEK]: this.i18n('Last week'),
+      [GroupDate.LAST_MONTH]: this.i18n('Last month'),
       [GroupDate.OLDER]: this.i18n('Older')
     }
 
@@ -98,7 +103,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 () {
@@ -131,16 +141,16 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
   }
 
   loadMoreVideos () {
-    const observable = this.getVideosObservable(this.pagination.currentPage)
-
-    observable.subscribe(
-      ({ videos, totalVideos }) => {
-        this.pagination.totalItems = totalVideos
-        this.videos = this.videos.concat(videos)
+    this.getVideosObservable(this.pagination.currentPage).subscribe(
+      ({ data, total }) => {
+        this.pagination.totalItems = total
+        this.videos = this.videos.concat(data)
 
         if (this.groupByDate) this.buildGroupedDateLabels()
 
         this.onMoreVideos()
+
+        this.onDataSubject.next(data)
       },
 
       error => this.notifier.error(error.message)
@@ -183,18 +193,18 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
         continue
       }
 
-      if (currentGroupedDate <= GroupDate.THIS_WEEK && isThisWeek(publishedDate)) {
-        if (currentGroupedDate === GroupDate.THIS_WEEK) continue
+      if (currentGroupedDate <= GroupDate.LAST_WEEK && isLastWeek(publishedDate)) {
+        if (currentGroupedDate === GroupDate.LAST_WEEK) continue
 
-        currentGroupedDate = GroupDate.THIS_WEEK
+        currentGroupedDate = GroupDate.LAST_WEEK
         this.groupedDates[ video.id ] = currentGroupedDate
         continue
       }
 
-      if (currentGroupedDate <= GroupDate.THIS_MONTH && isThisMonth(publishedDate)) {
-        if (currentGroupedDate === GroupDate.THIS_MONTH) continue
+      if (currentGroupedDate <= GroupDate.LAST_MONTH && isLastMonth(publishedDate)) {
+        if (currentGroupedDate === GroupDate.LAST_MONTH) continue
 
-        currentGroupedDate = GroupDate.THIS_MONTH
+        currentGroupedDate = GroupDate.LAST_MONTH
         this.groupedDates[ video.id ] = currentGroupedDate
         continue
       }
@@ -245,4 +255,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)
+        )
+  }
 }