import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { Observable } from 'rxjs'
-import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
+import { ComponentPaginationLight } from '@app/shared/rest/component-pagination.model'
import { VideoService } from '@app/shared/video/video.service'
import { RestExtractor, RestService } from '@app/shared'
-import { environment } from 'environments/environment'
+import { environment } from '../../environments/environment'
import { ResultList, Video as VideoServerModel, VideoChannel as VideoChannelServerModel } from '../../../../shared'
import { Video } from '@app/shared/video/video.model'
import { AdvancedSearch } from '@app/search/advanced-search.model'
import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
+import { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
@Injectable()
export class SearchService {
private restExtractor: RestExtractor,
private restService: RestService,
private videoService: VideoService
- ) {}
+ ) {
+ // Add ability to override search endpoint if the user updated this local storage key
+ const searchUrl = peertubeLocalStorage.getItem('search-url')
+ if (searchUrl) SearchService.BASE_SEARCH_URL = searchUrl
+ }
- searchVideos (
+ searchVideos (parameters: {
search: string,
- componentPagination: ComponentPagination,
+ componentPagination: ComponentPaginationLight,
advancedSearch: AdvancedSearch
- ): Observable<{ videos: Video[], totalVideos: number }> {
- const url = SearchService.BASE_SEARCH_URL + 'videos'
+ }): Observable<ResultList<Video>> {
+ const { search, componentPagination, advancedSearch } = parameters
+ const url = SearchService.BASE_SEARCH_URL + 'videos'
const pagination = this.restService.componentPaginationToRestPagination(componentPagination)
let params = new HttpParams()
)
}
- searchVideoChannels (
+ searchVideoChannels (parameters: {
search: string,
- componentPagination: ComponentPagination
- ): Observable<{ data: VideoChannel[], total: number }> {
- const url = SearchService.BASE_SEARCH_URL + 'video-channels'
+ componentPagination: ComponentPaginationLight
+ }): Observable<ResultList<VideoChannel>> {
+ const { search, componentPagination } = parameters
+ const url = SearchService.BASE_SEARCH_URL + 'video-channels'
const pagination = this.restService.componentPaginationToRestPagination(componentPagination)
let params = new HttpParams()