X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fcore%2Fserver%2Fserver.service.ts;h=fdfbe4c0260b68d17ca6da0aa9869a4416c9c0e6;hb=cdd8f7790c759664fe4d0962efa550cf1a8e37eb;hp=a71c6d0bfbd74811ecc443a0f4592fb979ae0b32;hpb=9d3ef9fe052ed29bd67566754cb28662bd122234;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 a71c6d0bf..fdfbe4c02 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -1,43 +1,87 @@
+import { first, map, share, shareReplay, switchMap, tap } from 'rxjs/operators'
 import { HttpClient } from '@angular/common/http'
-import { Injectable } from '@angular/core'
-import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage'
-import 'rxjs/add/operator/do'
-import { ReplaySubject } from 'rxjs/ReplaySubject'
-import { ServerConfig } from '../../../../../shared'
-import { About } from '../../../../../shared/models/server/about.model'
+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 { environment } from '../../../environments/environment'
-import { VideoConstant, VideoPrivacy } from '../../../../../shared/models/videos'
+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 {
   private static BASE_CONFIG_URL = environment.apiUrl + '/api/v1/config/'
   private static BASE_VIDEO_URL = environment.apiUrl + '/api/v1/videos/'
+  private static BASE_VIDEO_PLAYLIST_URL = environment.apiUrl + '/api/v1/video-playlists/'
+  private static BASE_LOCALE_URL = environment.apiUrl + '/client/locales/'
+  private static BASE_STATS_URL = environment.apiUrl + '/api/v1/server/stats'
+
   private static CONFIG_LOCAL_STORAGE_KEY = 'server-config'
 
-  configLoaded = new ReplaySubject<boolean>(1)
-  videoPrivaciesLoaded = new ReplaySubject<boolean>(1)
-  videoCategoriesLoaded = new ReplaySubject<boolean>(1)
-  videoLicencesLoaded = new ReplaySubject<boolean>(1)
-  videoLanguagesLoaded = new ReplaySubject<boolean>(1)
+  configReloaded = new Subject<ServerConfig>()
+
+  private localeObservable: Observable<any>
+  private videoLicensesObservable: Observable<VideoConstant<number>[]>
+  private videoCategoriesObservable: Observable<VideoConstant<number>[]>
+  private videoPrivaciesObservable: Observable<VideoConstant<number>[]>
+  private videoPlaylistPrivaciesObservable: Observable<VideoConstant<number>[]>
+  private videoLanguagesObservable: Observable<VideoConstant<string>[]>
+  private configObservable: Observable<ServerConfig>
 
+  private configReset = false
+
+  private configLoaded = false
   private config: ServerConfig = {
     instance: {
       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',
       customizations: {
         javascript: '',
         css: ''
       }
     },
+    search: {
+      remoteUri: {
+        users: true,
+        anonymous: false
+      }
+    },
+    plugin: {
+      registered: [],
+      registeredExternalAuths: [],
+      registeredIdAndPassAuths: []
+    },
+    theme: {
+      registered: [],
+      default: 'default'
+    },
+    email: {
+      enabled: false
+    },
+    contactForm: {
+      enabled: false
+    },
     serverVersion: 'Unknown',
     signup: {
-      allowed: false
+      allowed: false,
+      allowedForCurrentIP: false,
+      requiresEmailVerification: false
     },
     transcoding: {
-      enabledResolutions: []
+      enabledResolutions: [],
+      hls: {
+        enabled: false
+      },
+      webtorrent: {
+        enabled: true
+      }
     },
     avatar: {
       file: {
@@ -54,95 +98,204 @@ export class ServerService {
         extensions: []
       }
     },
+    videoCaption: {
+      file: {
+        size: { max: 0 },
+        extensions: []
+      }
+    },
     user: {
-      videoQuota: -1
+      videoQuota: -1,
+      videoQuotaDaily: -1
+    },
+    import: {
+      videos: {
+        http: {
+          enabled: false
+        },
+        torrent: {
+          enabled: false
+        }
+      }
+    },
+    trending: {
+      videos: {
+        intervalDays: 0
+      }
+    },
+    autoBlacklist: {
+      videos: {
+        ofUsers: {
+          enabled: false
+        }
+      }
+    },
+    tracker: {
+      enabled: true
+    },
+    followings: {
+      instance: {
+        autoFollowIndex: {
+          indexUrl: 'https://instances.joinpeertube.org'
+        }
+      }
+    },
+    broadcastMessage: {
+      enabled: false,
+      message: '',
+      level: 'info',
+      dismissable: false
     }
   }
-  private videoCategories: Array<VideoConstant<number>> = []
-  private videoLicences: Array<VideoConstant<number>> = []
-  private videoLanguages: Array<VideoConstant<string>> = []
-  private videoPrivacies: Array<VideoConstant<VideoPrivacy>> = []
 
-  constructor (private http: HttpClient) {
+  constructor (
+    private http: HttpClient,
+    @Inject(LOCALE_ID) private localeId: string
+  ) {
     this.loadConfigLocally()
   }
 
-  loadConfig () {
-    this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
-      .do(this.saveConfigLocally)
-      .subscribe(data => {
-        this.config = data
+  getServerVersionAndCommit () {
+    const serverVersion = this.config.serverVersion
+    const commit = this.config.serverCommit || ''
 
-        this.configLoaded.next(true)
-      })
-  }
+    let result = serverVersion
+    if (commit) result += '...' + commit
 
-  loadVideoCategories () {
-    return this.loadVideoAttributeEnum('categories', this.videoCategories, this.videoCategoriesLoaded, true)
+    return result
   }
 
-  loadVideoLicences () {
-    return this.loadVideoAttributeEnum('licences', this.videoLicences, this.videoLicencesLoaded)
-  }
+  resetConfig () {
+    this.configLoaded = false
+    this.configReset = true
 
-  loadVideoLanguages () {
-    return this.loadVideoAttributeEnum('languages', this.videoLanguages, this.videoLanguagesLoaded, true)
+    // Notify config update
+    this.getConfig().subscribe(() => {
+      // empty, to fire a reset config event
+    })
   }
 
-  loadVideoPrivacies () {
-    return this.loadVideoAttributeEnum('privacies', this.videoPrivacies, this.videoPrivaciesLoaded)
+  getConfig () {
+    if (this.configLoaded) return of(this.config)
+
+    if (!this.configObservable) {
+      this.configObservable = this.http.get<ServerConfig>(ServerService.BASE_CONFIG_URL)
+                                  .pipe(
+                                    tap(config => this.saveConfigLocally(config)),
+                                    tap(config => {
+                                      this.config = config
+                                      this.configLoaded = true
+                                    }),
+                                    tap(config => {
+                                      if (this.configReset) {
+                                        this.configReloaded.next(config)
+                                        this.configReset = false
+                                      }
+                                    }),
+                                    share()
+                                  )
+    }
+
+    return this.configObservable
   }
 
-  getConfig () {
+  getTmpConfig () {
     return this.config
   }
 
   getVideoCategories () {
-    return this.videoCategories
+    if (!this.videoCategoriesObservable) {
+      this.videoCategoriesObservable = this.loadAttributeEnum<number>(ServerService.BASE_VIDEO_URL, 'categories', true)
+    }
+
+    return this.videoCategoriesObservable.pipe(first())
   }
 
   getVideoLicences () {
-    return this.videoLicences
+    if (!this.videoLicensesObservable) {
+      this.videoLicensesObservable = this.loadAttributeEnum<number>(ServerService.BASE_VIDEO_URL, 'licences')
+    }
+
+    return this.videoLicensesObservable.pipe(first())
   }
 
   getVideoLanguages () {
-    return this.videoLanguages
+    if (!this.videoLanguagesObservable) {
+      this.videoLanguagesObservable = this.loadAttributeEnum<string>(ServerService.BASE_VIDEO_URL, 'languages', true)
+    }
+
+    return this.videoLanguagesObservable.pipe(first())
   }
 
   getVideoPrivacies () {
-    return this.videoPrivacies
+    if (!this.videoPrivaciesObservable) {
+      this.videoPrivaciesObservable = this.loadAttributeEnum<number>(ServerService.BASE_VIDEO_URL, 'privacies')
+    }
+
+    return this.videoPrivaciesObservable.pipe(first())
   }
 
-  getAbout () {
-    return this.http.get<About>(ServerService.BASE_CONFIG_URL + '/about')
+  getVideoPlaylistPrivacies () {
+    if (!this.videoPlaylistPrivaciesObservable) {
+      this.videoPlaylistPrivaciesObservable = this.loadAttributeEnum<number>(ServerService.BASE_VIDEO_PLAYLIST_URL, 'privacies')
+    }
+
+    return this.videoPlaylistPrivaciesObservable.pipe(first())
+  }
+
+  getServerLocale () {
+    if (!this.localeObservable) {
+      const completeLocale = isOnDevLocale() ? getDevLocale() : getCompleteLocale(this.localeId)
+
+      // Default locale, nothing to translate
+      if (isDefaultLocale(completeLocale)) {
+        this.localeObservable = of({}).pipe(shareReplay())
+      } else {
+        this.localeObservable = this.http
+                                    .get(ServerService.BASE_LOCALE_URL + completeLocale + '/server.json')
+                                    .pipe(shareReplay())
+      }
+    }
+
+    return this.localeObservable.pipe(first())
+  }
+
+  getServerStats () {
+    return this.http.get<ServerStats>(ServerService.BASE_STATS_URL)
   }
 
-  private loadVideoAttributeEnum (
+  private loadAttributeEnum <T extends string | number> (
+    baseUrl: string,
     attributeName: 'categories' | 'licences' | 'languages' | 'privacies',
-    hashToPopulate: VideoConstant<number | string>[],
-    notifier: ReplaySubject<boolean>,
     sort = false
   ) {
-    return this.http.get(ServerService.BASE_VIDEO_URL + attributeName)
-       .subscribe(data => {
-         Object.keys(data)
-               .forEach(dataKey => {
-                 hashToPopulate.push({
-                   id: dataKey,
-                   label: data[dataKey]
-                 })
-               })
-
-         if (sort === true) {
-           hashToPopulate.sort((a, b) => {
-             if (a.label < b.label) return -1
-             if (a.label === b.label) return 0
-             return 1
-           })
-         }
-
-         notifier.next(true)
-       })
+    return this.getServerLocale()
+               .pipe(
+                 switchMap(translations => {
+                   return this.http.get<{ [ id: string ]: string }>(baseUrl + attributeName)
+                              .pipe(map(data => ({ data, translations })))
+                 }),
+                 map(({ data, translations }) => {
+                   const hashToPopulate: VideoConstant<T>[] = Object.keys(data)
+                                                                    .map(dataKey => {
+                                                                      const label = data[ dataKey ]
+
+                                                                      const id = attributeName === 'languages'
+                                                                        ? dataKey as T
+                                                                        : parseInt(dataKey, 10) as T
+
+                                                                      return {
+                                                                        id,
+                                                                        label: peertubeTranslate(label, translations)
+                                                                      }
+                                                                    })
+
+                   if (sort === true) sortBy(hashToPopulate, 'label')
+
+                   return hashToPopulate
+                 }),
+                 shareReplay()
+               )
   }
 
   private saveConfigLocally (config: ServerConfig) {