X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2Fvideo-list%2Fvideo-user-subscriptions.component.ts;h=ac325aeff1f25829e158990141e77f45deb846c6;hb=93cae47925e4dd68b7d34a41927b2740b4fab1b4;hp=6e8959c54a34ed41591c6961903a3a7b6ea52357;hpb=22a16e36f6526887ed8f5e5d3c9f9e5da0b4a8cd;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/videos/video-list/video-user-subscriptions.component.ts b/client/src/app/videos/video-list/video-user-subscriptions.component.ts index 6e8959c54..ac325aeff 100644 --- a/client/src/app/videos/video-list/video-user-subscriptions.component.ts +++ b/client/src/app/videos/video-list/video-user-subscriptions.component.ts @@ -1,8 +1,6 @@ import { Component, OnDestroy, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' import { immutableAssign } from '@app/shared/misc/utils' -import { Location } from '@angular/common' -import { NotificationsService } from 'angular2-notifications' import { AuthService } from '../../core/auth' import { AbstractVideoList } from '../../shared/video/abstract-video-list' import { VideoSortField } from '../../shared/video/sort-field.type' @@ -10,6 +8,8 @@ import { VideoService } from '../../shared/video/video.service' import { I18n } from '@ngx-translate/i18n-polyfill' import { ScreenService } from '@app/shared/misc/screen.service' import { OwnerDisplayType } from '@app/shared/video/video-miniature.component' +import { Notifier, ServerService } from '@app/core' +import { HooksService } from '@app/core/plugins/hooks.service' @Component({ selector: 'my-videos-user-subscriptions', @@ -18,19 +18,20 @@ import { OwnerDisplayType } from '@app/shared/video/video-miniature.component' }) export class VideoUserSubscriptionsComponent extends AbstractVideoList implements OnInit, OnDestroy { titlePage: string - currentRoute = '/videos/subscriptions' sort = '-publishedAt' as VideoSortField ownerDisplayType: OwnerDisplayType = 'auto' + groupByDate = true constructor ( + protected i18n: I18n, protected router: Router, + protected serverService: ServerService, protected route: ActivatedRoute, - protected notificationsService: NotificationsService, + protected notifier: Notifier, protected authService: AuthService, - protected location: Location, - protected i18n: I18n, protected screenService: ScreenService, - private videoService: VideoService + private videoService: VideoService, + private hooks: HooksService ) { super() @@ -47,8 +48,18 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement getVideosObservable (page: number) { const newPagination = immutableAssign(this.pagination, { currentPage: page }) + const params = { + videoPagination: newPagination, + sort: this.sort + } - return this.videoService.getUserSubscriptionVideos(newPagination, this.sort) + return this.hooks.wrapObsFun( + this.videoService.getUserSubscriptionVideos.bind(this.videoService), + params, + 'common', + 'filter:api.videos.list.user-subscriptions.params', + 'filter:api.videos.list.user-subscriptions.result' + ) } generateSyndicationList () {