diff options
Diffstat (limited to 'client/src/app/shared/video/video.service.ts')
-rw-r--r-- | client/src/app/shared/video/video.service.ts | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index 2dd47d74e..996202154 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -15,7 +15,7 @@ import { | |||
15 | } from '../../../../../shared/models/videos' | 15 | } from '../../../../../shared/models/videos' |
16 | import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' | 16 | import { FeedFormat } from '../../../../../shared/models/feeds/feed-format.enum' |
17 | import { environment } from '../../../environments/environment' | 17 | import { environment } from '../../../environments/environment' |
18 | import { ComponentPagination } from '../rest/component-pagination.model' | 18 | import { ComponentPaginationLight } from '../rest/component-pagination.model' |
19 | import { RestExtractor } from '../rest/rest-extractor.service' | 19 | import { RestExtractor } from '../rest/rest-extractor.service' |
20 | import { RestService } from '../rest/rest.service' | 20 | import { RestService } from '../rest/rest.service' |
21 | import { UserService } from '../users/user.service' | 21 | import { UserService } from '../users/user.service' |
@@ -34,7 +34,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' | |||
34 | 34 | ||
35 | export interface VideosProvider { | 35 | export interface VideosProvider { |
36 | getVideos (parameters: { | 36 | getVideos (parameters: { |
37 | videoPagination: ComponentPagination, | 37 | videoPagination: ComponentPaginationLight, |
38 | sort: VideoSortField, | 38 | sort: VideoSortField, |
39 | filter?: VideoFilter, | 39 | filter?: VideoFilter, |
40 | categoryOneOf?: number, | 40 | categoryOneOf?: number, |
@@ -121,7 +121,7 @@ export class VideoService implements VideosProvider { | |||
121 | .pipe(catchError(err => this.restExtractor.handleError(err))) | 121 | .pipe(catchError(err => this.restExtractor.handleError(err))) |
122 | } | 122 | } |
123 | 123 | ||
124 | getMyVideos (videoPagination: ComponentPagination, sort: VideoSortField, search?: string): Observable<ResultList<Video>> { | 124 | getMyVideos (videoPagination: ComponentPaginationLight, sort: VideoSortField, search?: string): Observable<ResultList<Video>> { |
125 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 125 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
126 | 126 | ||
127 | let params = new HttpParams() | 127 | let params = new HttpParams() |
@@ -138,7 +138,7 @@ export class VideoService implements VideosProvider { | |||
138 | 138 | ||
139 | getAccountVideos ( | 139 | getAccountVideos ( |
140 | account: Account, | 140 | account: Account, |
141 | videoPagination: ComponentPagination, | 141 | videoPagination: ComponentPaginationLight, |
142 | sort: VideoSortField | 142 | sort: VideoSortField |
143 | ): Observable<ResultList<Video>> { | 143 | ): Observable<ResultList<Video>> { |
144 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 144 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
@@ -156,7 +156,7 @@ export class VideoService implements VideosProvider { | |||
156 | 156 | ||
157 | getVideoChannelVideos ( | 157 | getVideoChannelVideos ( |
158 | videoChannel: VideoChannel, | 158 | videoChannel: VideoChannel, |
159 | videoPagination: ComponentPagination, | 159 | videoPagination: ComponentPaginationLight, |
160 | sort: VideoSortField | 160 | sort: VideoSortField |
161 | ): Observable<ResultList<Video>> { | 161 | ): Observable<ResultList<Video>> { |
162 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 162 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
@@ -173,15 +173,18 @@ export class VideoService implements VideosProvider { | |||
173 | } | 173 | } |
174 | 174 | ||
175 | getUserSubscriptionVideos (parameters: { | 175 | getUserSubscriptionVideos (parameters: { |
176 | videoPagination: ComponentPagination, | 176 | videoPagination: ComponentPaginationLight, |
177 | sort: VideoSortField | 177 | sort: VideoSortField, |
178 | skipCount?: boolean | ||
178 | }): Observable<ResultList<Video>> { | 179 | }): Observable<ResultList<Video>> { |
179 | const { videoPagination, sort } = parameters | 180 | const { videoPagination, sort, skipCount } = parameters |
180 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 181 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
181 | 182 | ||
182 | let params = new HttpParams() | 183 | let params = new HttpParams() |
183 | params = this.restService.addRestGetParams(params, pagination, sort) | 184 | params = this.restService.addRestGetParams(params, pagination, sort) |
184 | 185 | ||
186 | if (skipCount) params = params.set('skipCount', skipCount + '') | ||
187 | |||
185 | return this.authHttp | 188 | return this.authHttp |
186 | .get<ResultList<Video>>(UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/videos', { params }) | 189 | .get<ResultList<Video>>(UserSubscriptionService.BASE_USER_SUBSCRIPTIONS_URL + '/videos', { params }) |
187 | .pipe( | 190 | .pipe( |
@@ -191,26 +194,23 @@ export class VideoService implements VideosProvider { | |||
191 | } | 194 | } |
192 | 195 | ||
193 | getVideos (parameters: { | 196 | getVideos (parameters: { |
194 | videoPagination: ComponentPagination, | 197 | videoPagination: ComponentPaginationLight, |
195 | sort: VideoSortField, | 198 | sort: VideoSortField, |
196 | filter?: VideoFilter, | 199 | filter?: VideoFilter, |
197 | categoryOneOf?: number, | 200 | categoryOneOf?: number, |
198 | languageOneOf?: string[] | 201 | languageOneOf?: string[], |
202 | skipCount?: boolean | ||
199 | }): Observable<ResultList<Video>> { | 203 | }): Observable<ResultList<Video>> { |
200 | const { videoPagination, sort, filter, categoryOneOf, languageOneOf } = parameters | 204 | const { videoPagination, sort, filter, categoryOneOf, languageOneOf, skipCount } = parameters |
201 | 205 | ||
202 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 206 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
203 | 207 | ||
204 | let params = new HttpParams() | 208 | let params = new HttpParams() |
205 | params = this.restService.addRestGetParams(params, pagination, sort) | 209 | params = this.restService.addRestGetParams(params, pagination, sort) |
206 | 210 | ||
207 | if (filter) { | 211 | if (filter) params = params.set('filter', filter) |
208 | params = params.set('filter', filter) | 212 | if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '') |
209 | } | 213 | if (skipCount) params = params.set('skipCount', skipCount + '') |
210 | |||
211 | if (categoryOneOf) { | ||
212 | params = params.set('categoryOneOf', categoryOneOf + '') | ||
213 | } | ||
214 | 214 | ||
215 | if (languageOneOf) { | 215 | if (languageOneOf) { |
216 | for (const l of languageOneOf) { | 216 | for (const l of languageOneOf) { |