Fix updating boolean anonymous settings

[github/Chocobozzz/PeerTube.git] / client / src / app / core / server / server.service.ts

diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index fdfbe4c0260b68d17ca6da0aa9869a4416c9c0e6..11288fc542ef18063522a0b783b631285d394625 100644 (file)
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -1,15 +1,12 @@
+import { Observable, of, Subject } from 'rxjs'
 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 { peertubeLocalStorage } from '@app/shared/misc/peertube-web-storage'
-import { Observable, of, Subject } from 'rxjs'
-import { getCompleteLocale, ServerConfig } from '../../../../../shared'
+import { getDevLocale, isOnDevLocale, sortBy } from '@app/helpers'
+import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage'
+import { getCompleteLocale, isDefaultLocale, peertubeTranslate } from '@shared/core-utils/i18n'
+import { SearchTargetType, ServerConfig, ServerStats, VideoConstant } from '@shared/models'
 import { environment } from '../../../environments/environment'
-import { VideoConstant } from '../../../../../shared/models/videos'
-import { isDefaultLocale, peertubeTranslate } from '../../../../../shared/models/i18n'
-import { getDevLocale, isOnDevLocale } from '@app/shared/i18n/i18n-utils'
-import { sortBy } from '@app/shared/misc/utils'
-import { ServerStats } from '@shared/models/server'
 
 @Injectable()
 export class ServerService {
@@ -39,20 +36,14 @@ export class ServerService {
       name: 'PeerTube',
       shortDescription: 'PeerTube, a federated (ActivityPub) video streaming platform  ' +
                         'using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.',
-      defaultClientRoute: '',
       isNSFW: false,
       defaultNSFWPolicy: 'do_not_list' as 'do_not_list',
+      defaultClientRoute: '',
       customizations: {
         javascript: '',
         css: ''
       }
     },
-    search: {
-      remoteUri: {
-        users: true,
-        anonymous: false
-      }
-    },
     plugin: {
       registered: [],
       registeredExternalAuths: [],
@@ -75,6 +66,8 @@ export class ServerService {
       requiresEmailVerification: false
     },
     transcoding: {
+      profile: 'default',
+      availableProfiles: [ 'default' ],
       enabledResolutions: [],
       hls: {
         enabled: false
@@ -83,6 +76,22 @@ export class ServerService {
         enabled: true
       }
     },
+    live: {
+      enabled: false,
+      allowReplay: true,
+      maxDuration: null,
+      maxInstanceLives: -1,
+      maxUserLives: -1,
+      transcoding: {
+        enabled: false,
+        profile: 'default',
+        availableProfiles: [ 'default' ],
+        enabledResolutions: []
+      },
+      rtmp: {
+        port: 1935
+      }
+    },
     avatar: {
       file: {
         size: { max: 0 },
@@ -120,7 +129,11 @@ export class ServerService {
     },
     trending: {
       videos: {
-        intervalDays: 0
+        intervalDays: 0,
+        algorithms: {
+          enabled: [ 'best', 'hot', 'most-viewed', 'most-liked' ],
+          default: 'most-viewed'
+        }
       }
     },
     autoBlacklist: {
@@ -145,6 +158,18 @@ export class ServerService {
       message: '',
       level: 'info',
       dismissable: false
+    },
+    search: {
+      remoteUri: {
+        users: true,
+        anonymous: false
+      },
+      searchIndex: {
+        enabled: false,
+        url: '',
+        disableLocalSearch: false,
+        isDefaultSearch: false
+      }
     }
   }
 
@@ -264,6 +289,20 @@ 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',