Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-search / search.service.ts

diff --git a/client/src/app/shared/shared-search/search.service.ts b/client/src/app/shared/shared-search/search.service.ts
index 415bf083c6c813ca0f331c6aa5de5850897c73ac..ad2de0f37f54dcb5741121a2d46dccddbe4e2d8b 100644 (file)
--- a/client/src/app/shared/shared-search/search.service.ts
+++ b/client/src/app/shared/shared-search/search.service.ts
@@ -4,7 +4,6 @@ import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { ComponentPaginationLight, RestExtractor, RestPagination, RestService } from '@app/core'
 import { Video, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main'
-import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
 import {
   ResultList,
   Video as VideoServerModel,
@@ -25,11 +24,7 @@ export class SearchService {
     private restService: RestService,
     private videoService: VideoService,
     private playlistService: VideoPlaylistService
-  ) {
-    // 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 (parameters: {
     search?: string
@@ -39,7 +34,7 @@ export class SearchService {
   }): Observable<ResultList<Video>> {
     const { search, uuids, componentPagination, advancedSearch } = parameters
 
-    if (advancedSearch.resultType !== undefined && advancedSearch.resultType !== 'videos') {
+    if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'videos') {
       return of({ total: 0, data: [] })
     }
 
@@ -77,7 +72,7 @@ export class SearchService {
   }): Observable<ResultList<VideoChannel>> {
     const { search, advancedSearch, componentPagination, handles } = parameters
 
-    if (advancedSearch.resultType !== undefined && advancedSearch.resultType !== 'channels') {
+    if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'channels') {
       return of({ total: 0, data: [] })
     }
 
@@ -115,7 +110,7 @@ export class SearchService {
   }): Observable<ResultList<VideoPlaylist>> {
     const { search, advancedSearch, componentPagination, uuids } = parameters
 
-    if (advancedSearch.resultType !== undefined && advancedSearch.resultType !== 'playlists') {
+    if (advancedSearch?.resultType !== undefined && advancedSearch.resultType !== 'playlists') {
       return of({ total: 0, data: [] })
     }