diff options
Diffstat (limited to 'client/src/app/videos/video-list')
4 files changed, 53 insertions, 15 deletions
diff --git a/client/src/app/videos/video-list/video-local.component.ts b/client/src/app/videos/video-list/video-local.component.ts index 5de4a13af..81b6ce493 100644 --- a/client/src/app/videos/video-list/video-local.component.ts +++ b/client/src/app/videos/video-list/video-local.component.ts | |||
@@ -10,6 +10,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' | |||
10 | import { ScreenService } from '@app/shared/misc/screen.service' | 10 | import { ScreenService } from '@app/shared/misc/screen.service' |
11 | import { UserRight } from '../../../../../shared/models/users' | 11 | import { UserRight } from '../../../../../shared/models/users' |
12 | import { Notifier, ServerService } from '@app/core' | 12 | import { Notifier, ServerService } from '@app/core' |
13 | import { HooksService } from '@app/core/plugins/hooks.service' | ||
13 | 14 | ||
14 | @Component({ | 15 | @Component({ |
15 | selector: 'my-videos-local', | 16 | selector: 'my-videos-local', |
@@ -31,7 +32,8 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On | |||
31 | protected notifier: Notifier, | 32 | protected notifier: Notifier, |
32 | protected authService: AuthService, | 33 | protected authService: AuthService, |
33 | protected screenService: ScreenService, | 34 | protected screenService: ScreenService, |
34 | private videoService: VideoService | 35 | private videoService: VideoService, |
36 | private hooks: HooksService | ||
35 | ) { | 37 | ) { |
36 | super() | 38 | super() |
37 | 39 | ||
@@ -55,14 +57,21 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On | |||
55 | 57 | ||
56 | getVideosObservable (page: number) { | 58 | getVideosObservable (page: number) { |
57 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) | 59 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) |
58 | 60 | const params = { | |
59 | return this.videoService.getVideos({ | ||
60 | videoPagination: newPagination, | 61 | videoPagination: newPagination, |
61 | sort: this.sort, | 62 | sort: this.sort, |
62 | filter: this.filter, | 63 | filter: this.filter, |
63 | categoryOneOf: this.categoryOneOf, | 64 | categoryOneOf: this.categoryOneOf, |
64 | languageOneOf: this.languageOneOf | 65 | languageOneOf: this.languageOneOf |
65 | }) | 66 | } |
67 | |||
68 | return this.hooks.wrapObsFun( | ||
69 | this.videoService.getVideos.bind(this.videoService), | ||
70 | params, | ||
71 | 'common', | ||
72 | 'filter:api.videos.list.local.params', | ||
73 | 'filter:api.videos.list.local.result' | ||
74 | ) | ||
66 | } | 75 | } |
67 | 76 | ||
68 | generateSyndicationList () { | 77 | generateSyndicationList () { |
diff --git a/client/src/app/videos/video-list/video-recently-added.component.ts b/client/src/app/videos/video-list/video-recently-added.component.ts index 19522e6b4..638e7caed 100644 --- a/client/src/app/videos/video-list/video-recently-added.component.ts +++ b/client/src/app/videos/video-list/video-recently-added.component.ts | |||
@@ -8,6 +8,7 @@ import { VideoService } from '../../shared/video/video.service' | |||
8 | import { I18n } from '@ngx-translate/i18n-polyfill' | 8 | import { I18n } from '@ngx-translate/i18n-polyfill' |
9 | import { ScreenService } from '@app/shared/misc/screen.service' | 9 | import { ScreenService } from '@app/shared/misc/screen.service' |
10 | import { Notifier, ServerService } from '@app/core' | 10 | import { Notifier, ServerService } from '@app/core' |
11 | import { HooksService } from '@app/core/plugins/hooks.service' | ||
11 | 12 | ||
12 | @Component({ | 13 | @Component({ |
13 | selector: 'my-videos-recently-added', | 14 | selector: 'my-videos-recently-added', |
@@ -29,7 +30,8 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On | |||
29 | protected notifier: Notifier, | 30 | protected notifier: Notifier, |
30 | protected authService: AuthService, | 31 | protected authService: AuthService, |
31 | protected screenService: ScreenService, | 32 | protected screenService: ScreenService, |
32 | private videoService: VideoService | 33 | private videoService: VideoService, |
34 | private hooks: HooksService | ||
33 | ) { | 35 | ) { |
34 | super() | 36 | super() |
35 | 37 | ||
@@ -48,14 +50,20 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On | |||
48 | 50 | ||
49 | getVideosObservable (page: number) { | 51 | getVideosObservable (page: number) { |
50 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) | 52 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) |
51 | 53 | const params = { | |
52 | return this.videoService.getVideos({ | ||
53 | videoPagination: newPagination, | 54 | videoPagination: newPagination, |
54 | sort: this.sort, | 55 | sort: this.sort, |
55 | filter: undefined, | ||
56 | categoryOneOf: this.categoryOneOf, | 56 | categoryOneOf: this.categoryOneOf, |
57 | languageOneOf: this.languageOneOf | 57 | languageOneOf: this.languageOneOf |
58 | }) | 58 | } |
59 | |||
60 | return this.hooks.wrapObsFun( | ||
61 | this.videoService.getVideos.bind(this.videoService), | ||
62 | params, | ||
63 | 'common', | ||
64 | 'filter:api.videos.list.recently-added.params', | ||
65 | 'filter:api.videos.list.recently-added.result' | ||
66 | ) | ||
59 | } | 67 | } |
60 | 68 | ||
61 | generateSyndicationList () { | 69 | generateSyndicationList () { |
diff --git a/client/src/app/videos/video-list/video-trending.component.ts b/client/src/app/videos/video-list/video-trending.component.ts index 5f1d5055b..0e69bfd64 100644 --- a/client/src/app/videos/video-list/video-trending.component.ts +++ b/client/src/app/videos/video-list/video-trending.component.ts | |||
@@ -8,6 +8,7 @@ import { VideoService } from '../../shared/video/video.service' | |||
8 | import { I18n } from '@ngx-translate/i18n-polyfill' | 8 | import { I18n } from '@ngx-translate/i18n-polyfill' |
9 | import { ScreenService } from '@app/shared/misc/screen.service' | 9 | import { ScreenService } from '@app/shared/misc/screen.service' |
10 | import { Notifier, ServerService } from '@app/core' | 10 | import { Notifier, ServerService } from '@app/core' |
11 | import { HooksService } from '@app/core/plugins/hooks.service' | ||
11 | 12 | ||
12 | @Component({ | 13 | @Component({ |
13 | selector: 'my-videos-trending', | 14 | selector: 'my-videos-trending', |
@@ -28,7 +29,8 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, | |||
28 | protected notifier: Notifier, | 29 | protected notifier: Notifier, |
29 | protected authService: AuthService, | 30 | protected authService: AuthService, |
30 | protected screenService: ScreenService, | 31 | protected screenService: ScreenService, |
31 | private videoService: VideoService | 32 | private videoService: VideoService, |
33 | private hooks: HooksService | ||
32 | ) { | 34 | ) { |
33 | super() | 35 | super() |
34 | } | 36 | } |
@@ -61,13 +63,20 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit, | |||
61 | 63 | ||
62 | getVideosObservable (page: number) { | 64 | getVideosObservable (page: number) { |
63 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) | 65 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) |
64 | return this.videoService.getVideos({ | 66 | const params = { |
65 | videoPagination: newPagination, | 67 | videoPagination: newPagination, |
66 | sort: this.sort, | 68 | sort: this.sort, |
67 | filter: undefined, | ||
68 | categoryOneOf: this.categoryOneOf, | 69 | categoryOneOf: this.categoryOneOf, |
69 | languageOneOf: this.languageOneOf | 70 | languageOneOf: this.languageOneOf |
70 | }) | 71 | } |
72 | |||
73 | return this.hooks.wrapObsFun( | ||
74 | this.videoService.getVideos.bind(this.videoService), | ||
75 | params, | ||
76 | 'common', | ||
77 | 'filter:api.videos.list.trending.params', | ||
78 | 'filter:api.videos.list.trending.result' | ||
79 | ) | ||
71 | } | 80 | } |
72 | 81 | ||
73 | generateSyndicationList () { | 82 | generateSyndicationList () { |
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 3caa371d8..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 | |||
@@ -9,6 +9,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' | |||
9 | import { ScreenService } from '@app/shared/misc/screen.service' | 9 | import { ScreenService } from '@app/shared/misc/screen.service' |
10 | import { OwnerDisplayType } from '@app/shared/video/video-miniature.component' | 10 | import { OwnerDisplayType } from '@app/shared/video/video-miniature.component' |
11 | import { Notifier, ServerService } from '@app/core' | 11 | import { Notifier, ServerService } from '@app/core' |
12 | import { HooksService } from '@app/core/plugins/hooks.service' | ||
12 | 13 | ||
13 | @Component({ | 14 | @Component({ |
14 | selector: 'my-videos-user-subscriptions', | 15 | selector: 'my-videos-user-subscriptions', |
@@ -29,7 +30,8 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement | |||
29 | protected notifier: Notifier, | 30 | protected notifier: Notifier, |
30 | protected authService: AuthService, | 31 | protected authService: AuthService, |
31 | protected screenService: ScreenService, | 32 | protected screenService: ScreenService, |
32 | private videoService: VideoService | 33 | private videoService: VideoService, |
34 | private hooks: HooksService | ||
33 | ) { | 35 | ) { |
34 | super() | 36 | super() |
35 | 37 | ||
@@ -46,8 +48,18 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement | |||
46 | 48 | ||
47 | getVideosObservable (page: number) { | 49 | getVideosObservable (page: number) { |
48 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) | 50 | const newPagination = immutableAssign(this.pagination, { currentPage: page }) |
51 | const params = { | ||
52 | videoPagination: newPagination, | ||
53 | sort: this.sort | ||
54 | } | ||
49 | 55 | ||
50 | return this.videoService.getUserSubscriptionVideos(newPagination, this.sort) | 56 | return this.hooks.wrapObsFun( |
57 | this.videoService.getUserSubscriptionVideos.bind(this.videoService), | ||
58 | params, | ||
59 | 'common', | ||
60 | 'filter:api.videos.list.user-subscriptions.params', | ||
61 | 'filter:api.videos.list.user-subscriptions.result' | ||
62 | ) | ||
51 | } | 63 | } |
52 | 64 | ||
53 | generateSyndicationList () { | 65 | generateSyndicationList () { |