X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fserver%2Fserver.service.ts;h=f33e6f20ce9648ce0d771ff08fbc5804c9e722cd;hb=d3e56c0c4b307c99e83fbafb7f2c5884cbc20055;hp=ab317f0aa6c5c490fa991b5218b4abd8b5d38471;hpb=9a12f169c15b638fe78cf6e85a1993550a25e404;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 ab317f0aa..f33e6f20c 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -1,4 +1,4 @@
-import { map, share, switchMap, tap } from 'rxjs/operators'
+import { map, 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-local-storage'
@@ -6,13 +6,14 @@ import { Observable, of, ReplaySubject } from 'rxjs'
 import { getCompleteLocale, ServerConfig } from '../../../../../shared'
 import { About } from '../../../../../shared/models/server/about.model'
 import { environment } from '../../../environments/environment'
-import { VideoConstant } from '../../../../../shared/models/videos'
-import { isDefaultLocale } from '../../../../../shared/models/i18n'
-import { getDevLocale, isOnDevLocale, peertubeTranslate } from '@app/shared/i18n/i18n-utils'
+import { VideoConstant, VideoPrivacy } 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'
 
 @Injectable()
 export class ServerService {
+  private static BASE_SERVER_URL = environment.apiUrl + '/api/v1/server/'
   private static BASE_CONFIG_URL = environment.apiUrl + '/api/v1/config/'
   private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
   private static BASE_LOCALE_URL = environment.apiUrl + '/client/locales/'
@@ -37,10 +38,17 @@ export class ServerService {
         css: ''
       }
     },
+    email: {
+      enabled: false
+    },
+    contactForm: {
+      enabled: false
+    },
     serverVersion: 'Unknown',
     signup: {
       allowed: false,
-      allowedForCurrentIP: false
+      allowedForCurrentIP: false,
+      requiresEmailVerification: false
     },
     transcoding: {
       enabledResolutions: []
@@ -67,20 +75,24 @@ export class ServerService {
       }
     },
     user: {
-      videoQuota: -1
+      videoQuota: -1,
+      videoQuotaDaily: -1
     },
     import: {
       videos: {
         http: {
           enabled: false
+        },
+        torrent: {
+          enabled: false
         }
       }
     }
   }
-  private videoCategories: Array<VideoConstant<string>> = []
-  private videoLicences: Array<VideoConstant<string>> = []
+  private videoCategories: Array<VideoConstant<number>> = []
+  private videoLicences: Array<VideoConstant<number>> = []
   private videoLanguages: Array<VideoConstant<string>> = []
-  private videoPrivacies: Array<VideoConstant<string>> = []
+  private videoPrivacies: Array<VideoConstant<VideoPrivacy>> = []
 
   constructor (
     private http: HttpClient,
@@ -136,20 +148,16 @@ export class ServerService {
     return this.videoPrivacies
   }
 
-  getAbout () {
-    return this.http.get<About>(ServerService.BASE_CONFIG_URL + '/about')
-  }
-
   private loadVideoAttributeEnum (
     attributeName: 'categories' | 'licences' | 'languages' | 'privacies',
-    hashToPopulate: VideoConstant<string>[],
+    hashToPopulate: VideoConstant<string | number>[],
     notifier: ReplaySubject<boolean>,
     sort = false
   ) {
     this.localeObservable
         .pipe(
           switchMap(translations => {
-            return this.http.get(ServerService.BASE_VIDEO_URL + attributeName)
+            return this.http.get<{ [id: string]: string }>(ServerService.BASE_VIDEO_URL + attributeName)
                        .pipe(map(data => ({ data, translations })))
           })
         )
@@ -159,7 +167,7 @@ export class ServerService {
                   const label = data[ dataKey ]
 
                   hashToPopulate.push({
-                    id: dataKey,
+                    id: attributeName === 'languages' ? dataKey : parseInt(dataKey, 10),
                     label: peertubeTranslate(label, translations)
                   })
                 })
@@ -175,13 +183,13 @@ export class ServerService {
 
     // Default locale, nothing to translate
     if (isDefaultLocale(completeLocale)) {
-      this.localeObservable = of({}).pipe(share())
+      this.localeObservable = of({}).pipe(shareReplay())
       return
     }
 
     this.localeObservable = this.http
                                   .get(ServerService.BASE_LOCALE_URL + completeLocale + '/server.json')
-                                  .pipe(share())
+                                  .pipe(shareReplay())
   }
 
   private saveConfigLocally (config: ServerConfig) {