X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fserver%2Fserver.service.ts;h=fc269749bf36d0d7df5df070b83de7403fb4ad80;hb=54909304287f3c04dcfb39660be8ead57dc95440;hp=251963858f63705a455edb523dff48050dad2390;hpb=8e08d415f9473b6b72fef698729453e726da16e7;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index 251963858..fc269749b 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -3,8 +3,9 @@ import { first, map, share, shareReplay, switchMap, tap } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
 import { Inject, Injectable, LOCALE_ID } from '@angular/core'
 import { getDevLocale, isOnDevLocale, sortBy } from '@app/helpers'
+import { logger } from '@root-helpers/logger'
 import { getCompleteLocale, isDefaultLocale, peertubeTranslate } from '@shared/core-utils/i18n'
-import { HTMLServerConfig, SearchTargetType, ServerConfig, ServerStats, VideoConstant } from '@shared/models'
+import { HTMLServerConfig, ServerConfig, ServerStats, VideoConstant } from '@shared/models'
 import { environment } from '../../../environments/environment'
 
 @Injectable()
@@ -37,13 +38,13 @@ export class ServerService {
   ) {
   }
 
-  loadConfig () {
+  loadHTMLConfig () {
     try {
-      return this.loadConfigLocally()
+      this.loadHTMLConfigLocally()
     } catch (err) {
       // Expected in dev mode since we can't inject the config in the HTML
       if (environment.production !== false) {
-        console.error('Cannot load config locally. Fallback to API.')
+        logger.error('Cannot load config locally. Fallback to API.')
       }
 
       return this.getConfig()
@@ -76,6 +77,7 @@ export class ServerService {
                                   .pipe(
                                     tap(config => {
                                       this.config = config
+                                      this.htmlConfig = config
                                       this.configLoaded = true
                                     }),
                                     tap(config => {
@@ -91,8 +93,8 @@ export class ServerService {
     return this.configObservable
   }
 
-  getTmpConfig () {
-    return this.config
+  getHTMLConfig () {
+    return this.htmlConfig
   }
 
   getVideoCategories () {
@@ -135,7 +137,7 @@ export class ServerService {
     return this.videoPlaylistPrivaciesObservable.pipe(first())
   }
 
-  getServerLocale () {
+  getServerLocale (): Observable<{ [ id: string ]: string }> {
     if (!this.localeObservable) {
       const completeLocale = isOnDevLocale() ? getDevLocale() : getCompleteLocale(this.localeId)
 
@@ -156,20 +158,6 @@ export class ServerService {
     return this.http.get<ServerStats>(ServerService.BASE_STATS_URL)
   }
 
-  getDefaultSearchTarget (): Promise<SearchTargetType> {
-    return this.getConfig().pipe(
-      map(config => {
-        const searchIndexConfig = config.search.searchIndex
-
-        if (searchIndexConfig.enabled && (searchIndexConfig.isDefaultSearch || searchIndexConfig.disableLocalSearch)) {
-          return 'search-index'
-        }
-
-        return 'local'
-      })
-    ).toPromise()
-  }
-
   private loadAttributeEnum <T extends string | number> (
     baseUrl: string,
     attributeName: 'categories' | 'licences' | 'languages' | 'privacies',
@@ -184,7 +172,7 @@ export class ServerService {
                  map(({ data, translations }) => {
                    const hashToPopulate: VideoConstant<T>[] = Object.keys(data)
                                                                     .map(dataKey => {
-                                                                      const label = data[ dataKey ]
+                                                                      const label = data[dataKey]
 
                                                                       const id = attributeName === 'languages'
                                                                         ? dataKey as T
@@ -204,12 +192,13 @@ export class ServerService {
                )
   }
 
-  private loadConfigLocally () {
-    const configString = window['PeerTubeServerConfig']
+  private loadHTMLConfigLocally () {
+    // FIXME: typings
+    const configString = (window as any)['PeerTubeServerConfig']
     if (!configString) {
       throw new Error('Could not find PeerTubeServerConfig in HTML')
     }
 
-    this.config = JSON.parse(configString)
+    this.htmlConfig = JSON.parse(configString)
   }
 }