diff options
Diffstat (limited to 'client/src/app/shared/shared-search/search.service.ts')
-rw-r--r-- | client/src/app/shared/shared-search/search.service.ts | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/client/src/app/shared/shared-search/search.service.ts b/client/src/app/shared/shared-search/search.service.ts index ad258f5e5..a1603da98 100644 --- a/client/src/app/shared/shared-search/search.service.ts +++ b/client/src/app/shared/shared-search/search.service.ts | |||
@@ -7,7 +7,6 @@ import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/sha | |||
7 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' | 7 | import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' |
8 | import { | 8 | import { |
9 | ResultList, | 9 | ResultList, |
10 | SearchTargetType, | ||
11 | Video as VideoServerModel, | 10 | Video as VideoServerModel, |
12 | VideoChannel as VideoChannelServerModel, | 11 | VideoChannel as VideoChannelServerModel, |
13 | VideoPlaylist as VideoPlaylistServerModel | 12 | VideoPlaylist as VideoPlaylistServerModel |
@@ -33,8 +32,8 @@ export class SearchService { | |||
33 | } | 32 | } |
34 | 33 | ||
35 | searchVideos (parameters: { | 34 | searchVideos (parameters: { |
36 | search: string, | 35 | search: string |
37 | componentPagination?: ComponentPaginationLight, | 36 | componentPagination?: ComponentPaginationLight |
38 | advancedSearch?: AdvancedSearch | 37 | advancedSearch?: AdvancedSearch |
39 | }): Observable<ResultList<Video>> { | 38 | }): Observable<ResultList<Video>> { |
40 | const { search, componentPagination, advancedSearch } = parameters | 39 | const { search, componentPagination, advancedSearch } = parameters |
@@ -52,7 +51,7 @@ export class SearchService { | |||
52 | if (search) params = params.append('search', search) | 51 | if (search) params = params.append('search', search) |
53 | 52 | ||
54 | if (advancedSearch) { | 53 | if (advancedSearch) { |
55 | const advancedSearchObject = advancedSearch.toAPIObject() | 54 | const advancedSearchObject = advancedSearch.toVideosAPIObject() |
56 | params = this.restService.addObjectParams(params, advancedSearchObject) | 55 | params = this.restService.addObjectParams(params, advancedSearchObject) |
57 | } | 56 | } |
58 | 57 | ||
@@ -65,11 +64,11 @@ export class SearchService { | |||
65 | } | 64 | } |
66 | 65 | ||
67 | searchVideoChannels (parameters: { | 66 | searchVideoChannels (parameters: { |
68 | search: string, | 67 | search: string |
69 | searchTarget?: SearchTargetType, | 68 | advancedSearch?: AdvancedSearch |
70 | componentPagination?: ComponentPaginationLight | 69 | componentPagination?: ComponentPaginationLight |
71 | }): Observable<ResultList<VideoChannel>> { | 70 | }): Observable<ResultList<VideoChannel>> { |
72 | const { search, componentPagination, searchTarget } = parameters | 71 | const { search, advancedSearch, componentPagination } = parameters |
73 | 72 | ||
74 | const url = SearchService.BASE_SEARCH_URL + 'video-channels' | 73 | const url = SearchService.BASE_SEARCH_URL + 'video-channels' |
75 | 74 | ||
@@ -80,10 +79,12 @@ export class SearchService { | |||
80 | 79 | ||
81 | let params = new HttpParams() | 80 | let params = new HttpParams() |
82 | params = this.restService.addRestGetParams(params, pagination) | 81 | params = this.restService.addRestGetParams(params, pagination) |
83 | params = params.append('search', search) | ||
84 | 82 | ||
85 | if (searchTarget) { | 83 | if (search) params = params.append('search', search) |
86 | params = params.append('searchTarget', searchTarget as string) | 84 | |
85 | if (advancedSearch) { | ||
86 | const advancedSearchObject = advancedSearch.toChannelAPIObject() | ||
87 | params = this.restService.addObjectParams(params, advancedSearchObject) | ||
87 | } | 88 | } |
88 | 89 | ||
89 | return this.authHttp | 90 | return this.authHttp |
@@ -95,11 +96,11 @@ export class SearchService { | |||
95 | } | 96 | } |
96 | 97 | ||
97 | searchVideoPlaylists (parameters: { | 98 | searchVideoPlaylists (parameters: { |
98 | search: string, | 99 | search: string |
99 | searchTarget?: SearchTargetType, | 100 | advancedSearch?: AdvancedSearch |
100 | componentPagination?: ComponentPaginationLight | 101 | componentPagination?: ComponentPaginationLight |
101 | }): Observable<ResultList<VideoPlaylist>> { | 102 | }): Observable<ResultList<VideoPlaylist>> { |
102 | const { search, componentPagination, searchTarget } = parameters | 103 | const { search, advancedSearch, componentPagination } = parameters |
103 | 104 | ||
104 | const url = SearchService.BASE_SEARCH_URL + 'video-playlists' | 105 | const url = SearchService.BASE_SEARCH_URL + 'video-playlists' |
105 | 106 | ||
@@ -110,10 +111,12 @@ export class SearchService { | |||
110 | 111 | ||
111 | let params = new HttpParams() | 112 | let params = new HttpParams() |
112 | params = this.restService.addRestGetParams(params, pagination) | 113 | params = this.restService.addRestGetParams(params, pagination) |
113 | params = params.append('search', search) | ||
114 | 114 | ||
115 | if (searchTarget) { | 115 | if (search) params = params.append('search', search) |
116 | params = params.append('searchTarget', searchTarget as string) | 116 | |
117 | if (advancedSearch) { | ||
118 | const advancedSearchObject = advancedSearch.toPlaylistAPIObject() | ||
119 | params = this.restService.addObjectParams(params, advancedSearchObject) | ||
117 | } | 120 | } |
118 | 121 | ||
119 | return this.authHttp | 122 | return this.authHttp |