X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.ts;h=2c55b9a8482f8cfaecf6bf7ed56117a93527fe3c;hb=4a53fc8204d5a3a3d5a77b3dfe128f0985153bf8;hp=2dbe695c9c3f51420b7767b579d32e341a453c5e;hpb=67ed6552b831df66713bac9e672738796128d33f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index 2dbe695c9..2c55b9a84 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -1,21 +1,25 @@
 import { HotkeysService } from 'angular2-hotkeys'
+import * as debug from 'debug'
+import { switchMap } from 'rxjs/operators'
 import { Component, OnInit, ViewChild } from '@angular/core'
-import { AuthService, AuthStatus, RedirectService, ScreenService, ServerService, User, UserService } from '@app/core'
+import { AuthService, AuthStatus, AuthUser, RedirectService, ScreenService, ServerService, UserService } from '@app/core'
 import { LanguageChooserComponent } from '@app/menu/language-chooser.component'
 import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { ServerConfig, UserRight, VideoConstant } from '@shared/models'
 
+const logger = debug('peertube:menu:MenuComponent')
+
 @Component({
   selector: 'my-menu',
   templateUrl: './menu.component.html',
-  styleUrls: [ './menu.component.scss' ]
+  styleUrls: ['./menu.component.scss']
 })
 export class MenuComponent implements OnInit {
   @ViewChild('languageChooserModal', { static: true }) languageChooserModal: LanguageChooserComponent
   @ViewChild('quickSettingsModal', { static: true }) quickSettingsModal: QuickSettingsModalComponent
 
-  user: User
+  user: AuthUser
   isLoggedIn: boolean
 
   userHasAdminAccess = false
@@ -25,10 +29,10 @@ export class MenuComponent implements OnInit {
 
   private languages: VideoConstant<string>[] = []
   private serverConfig: ServerConfig
-  private routesPerRight: { [ role in UserRight ]?: string } = {
+  private routesPerRight: { [role in UserRight]?: string } = {
     [UserRight.MANAGE_USERS]: '/admin/users',
     [UserRight.MANAGE_SERVER_FOLLOW]: '/admin/friends',
-    [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/moderation/video-abuses',
+    [UserRight.MANAGE_ABUSES]: '/admin/moderation/abuses',
     [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/moderation/video-blocks',
     [UserRight.MANAGE_JOBS]: '/admin/jobs',
     [UserRight.MANAGE_CONFIGURATION]: '/admin/config'
@@ -62,21 +66,30 @@ export class MenuComponent implements OnInit {
       .subscribe(config => this.serverConfig = config)
 
     this.isLoggedIn = this.authService.isLoggedIn()
-    if (this.isLoggedIn === true) this.user = this.authService.getUser()
-    this.computeIsUserHasAdminAccess()
+    if (this.isLoggedIn === true) {
+      this.user = this.authService.getUser()
+      this.computeVideosLink()
+    }
+
+    this.computeAdminAccess()
 
     this.authService.loginChangedSource.subscribe(
       status => {
         if (status === AuthStatus.LoggedIn) {
           this.isLoggedIn = true
           this.user = this.authService.getUser()
-          this.computeIsUserHasAdminAccess()
-          console.log('Logged in.')
+
+          this.computeAdminAccess()
+          this.computeVideosLink()
+
+          logger('Logged in.')
         } else if (status === AuthStatus.LoggedOut) {
           this.isLoggedIn = false
           this.user = undefined
-          this.computeIsUserHasAdminAccess()
-          console.log('Logged out.')
+
+          this.computeAdminAccess()
+
+          logger('Logged out.')
         } else {
           console.error('Unknown auth status: ' + status)
         }
@@ -84,15 +97,15 @@ export class MenuComponent implements OnInit {
     )
 
     this.hotkeysService.cheatSheetToggle
-        .subscribe(isOpen => this.helpVisible = isOpen)
+      .subscribe(isOpen => this.helpVisible = isOpen)
 
     this.serverService.getVideoLanguages()
-        .subscribe(languages => {
-          this.languages = languages
+      .subscribe(languages => {
+        this.languages = languages
 
-          this.authService.userInformationLoaded
-              .subscribe(() => this.buildUserLanguages())
-        })
+        this.authService.userInformationLoaded
+          .subscribe(() => this.buildUserLanguages())
+      })
   }
 
   get language () {
@@ -116,7 +129,7 @@ export class MenuComponent implements OnInit {
 
   isRegistrationAllowed () {
     return this.serverConfig.signup.allowed &&
-           this.serverConfig.signup.allowedForCurrentIP
+      this.serverConfig.signup.allowedForCurrentIP
   }
 
   getFirstAdminRightAvailable () {
@@ -126,7 +139,7 @@ export class MenuComponent implements OnInit {
     const adminRights = [
       UserRight.MANAGE_USERS,
       UserRight.MANAGE_SERVER_FOLLOW,
-      UserRight.MANAGE_VIDEO_ABUSES,
+      UserRight.MANAGE_ABUSES,
       UserRight.MANAGE_VIDEO_BLACKLIST,
       UserRight.MANAGE_JOBS,
       UserRight.MANAGE_CONFIGURATION
@@ -172,7 +185,7 @@ export class MenuComponent implements OnInit {
     this.user.webTorrentEnabled = !this.user.webTorrentEnabled
 
     this.userService.updateMyProfile({ webTorrentEnabled: this.user.webTorrentEnabled })
-        .subscribe(() => this.authService.refreshUserInformation())
+      .subscribe(() => this.authService.refreshUserInformation())
   }
 
   langForLocale (localeId: string) {
@@ -188,18 +201,28 @@ export class MenuComponent implements OnInit {
     }
 
     if (!this.user.videoLanguages) {
-      this.videoLanguages = [ this.i18n('any language') ]
+      this.videoLanguages = [this.i18n('any language')]
       return
     }
 
     this.videoLanguages = this.user.videoLanguages
-                              .map(locale => this.langForLocale(locale))
-                              .map(value => value === undefined ? '?' : value)
+      .map(locale => this.langForLocale(locale))
+      .map(value => value === undefined ? '?' : value)
   }
 
-  private computeIsUserHasAdminAccess () {
+  private computeAdminAccess () {
     const right = this.getFirstAdminRightAvailable()
 
     this.userHasAdminAccess = right !== undefined
   }
+
+  private computeVideosLink () {
+    this.authService.userInformationLoaded
+      .pipe(
+        switchMap(() => this.user.computeCanSeeVideosLink(this.userService.getMyVideoQuotaUsed()))
+      ).subscribe(res => {
+        if (res === true) logger('User can see videos link.')
+        else logger('User cannot see videos link.')
+      })
+  }
 }