5 files changed, 55 insertions, 11 deletions

diff --git a/client/src/app/+video-channels/video-channels.component.html b/client/src/app/+video-channels/video-channels.component.html
index e5a32dc92..8d6f81e1b 100644
--- a/client/src/app/+video-channels/video-channels.component.html
+++ b/client/src/app/+video-channels/video-channels.component.html
@@ -9,7 +9,7 @@
           <div class="actor-display-name">{{ videoChannel.displayName }}</div>
           <div class="actor-name">{{ videoChannel.nameWithHost }}</div>
 
-          <my-subscribe-button *ngIf="isUserLoggedIn()" [videoChannel]="videoChannel"></my-subscribe-button>
+          <my-subscribe-button #subscribeButton *ngIf="isUserLoggedIn()" [videoChannel]="videoChannel"></my-subscribe-button>
         </div>
         <div i18n class="actor-followers">{{ videoChannel.followersCount }} subscribers</div>
 
diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts
index ee2c86915..82b4a345e 100644
--- a/client/src/app/+video-channels/video-channels.component.ts
+++ b/client/src/app/+video-channels/video-channels.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core'
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute } from '@angular/router'
 import { VideoChannel } from '@app/shared/video-channel/video-channel.model'
 import { VideoChannelService } from '@app/shared/video-channel/video-channel.service'
@@ -6,13 +6,18 @@ import { RestExtractor } from '@app/shared'
 import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators'
 import { Subscription } from 'rxjs'
 import { AuthService } from '@app/core'
+import { Hotkey, HotkeysService } from 'angular2-hotkeys'
+import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component'
 
 @Component({
   templateUrl: './video-channels.component.html',
   styleUrls: [ './video-channels.component.scss' ]
 })
 export class VideoChannelsComponent implements OnInit, OnDestroy {
+  @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
+
   videoChannel: VideoChannel
+  hotkeys: Hotkey[]
 
   private routeSub: Subscription
 
@@ -20,7 +25,8 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
     private route: ActivatedRoute,
     private authService: AuthService,
     private videoChannelService: VideoChannelService,
-    private restExtractor: RestExtractor
+    private restExtractor: RestExtractor,
+    private hotkeysService: HotkeysService
   ) { }
 
   ngOnInit () {
@@ -33,10 +39,22 @@ export class VideoChannelsComponent implements OnInit, OnDestroy {
                         )
                         .subscribe(videoChannel => this.videoChannel = videoChannel)
 
+    this.hotkeys = [
+      new Hotkey('S', (event: KeyboardEvent): boolean => {
+        this.subscribeButton.subscribed ?
+          this.subscribeButton.unsubscribe() :
+          this.subscribeButton.subscribe()
+        return false
+      }, undefined, 'Subscribe to the account')
+    ]
+    if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys)
   }
 
   ngOnDestroy () {
     if (this.routeSub) this.routeSub.unsubscribe()
+
+    // Unbind hotkeys
+    if (this.isUserLoggedIn()) this.hotkeysService.remove(this.hotkeys)
   }
 
   isUserLoggedIn () {
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 7bab2e2fd..40eac7fb8 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -128,27 +128,27 @@ export class AppComponent implements OnInit {
         document.getElementById('search-video').focus()
         return false // Prevent bubbling
       }, undefined, 'Focus the search bar'),
-      new Hotkey('g+s', (event: KeyboardEvent): boolean => {
+      new Hotkey('g s', (event: KeyboardEvent): boolean => {
         this.router.navigate([ '/videos/subscriptions' ])
         return false
       }, undefined, 'Go to the subscriptions videos page'),
-      new Hotkey('g+o', (event: KeyboardEvent): boolean => {
+      new Hotkey('g o', (event: KeyboardEvent): boolean => {
         this.router.navigate([ '/videos/overview' ])
         return false
       }, undefined, 'Go to the videos overview page'),
-      new Hotkey('g+t', (event: KeyboardEvent): boolean => {
+      new Hotkey('g t', (event: KeyboardEvent): boolean => {
         this.router.navigate([ '/videos/trending' ])
         return false
       }, undefined, 'Go to the trending videos page'),
-      new Hotkey('g+r', (event: KeyboardEvent): boolean => {
+      new Hotkey('g r', (event: KeyboardEvent): boolean => {
         this.router.navigate([ '/videos/recently-added' ])
         return false
       }, undefined, 'Go to the recently added videos page'),
-      new Hotkey('g+l', (event: KeyboardEvent): boolean => {
+      new Hotkey('g l', (event: KeyboardEvent): boolean => {
         this.router.navigate([ '/videos/local' ])
         return false
       }, undefined, 'Go to the local videos page'),
-      new Hotkey('g+u', (event: KeyboardEvent): boolean => {
+      new Hotkey('g u', (event: KeyboardEvent): boolean => {
         this.router.navigate([ '/videos/upload' ])
         return false
       }, undefined, 'Go to the videos upload page')
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 7dbc96bf4..0f2f3cf11 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -125,7 +125,7 @@
                 <img [src]="video.videoChannelAvatarUrl" alt="Video channel avatar" />
               </a>
 
-              <my-subscribe-button *ngIf="isUserLoggedIn()" [videoChannel]="video.channel" size="small"></my-subscribe-button>
+              <my-subscribe-button #subscribeButton *ngIf="isUserLoggedIn()" [videoChannel]="video.channel" size="small"></my-subscribe-button>
             </div>
 
             <div class="video-info-by">
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 25643cfde..768a08d42 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -1,4 +1,4 @@
-import { catchError } from 'rxjs/operators'
+import { catchError, subscribeOn } from 'rxjs/operators'
 import { ChangeDetectorRef, Component, ElementRef, Inject, LOCALE_ID, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { RedirectService } from '@app/core/routing/redirect.service'
@@ -9,6 +9,7 @@ import { NotificationsService } from 'angular2-notifications'
 import { forkJoin, Subscription } from 'rxjs'
 import * as videojs from 'video.js'
 import 'videojs-hotkeys'
+import { Hotkey, HotkeysService } from 'angular2-hotkeys'
 import * as WebTorrent from 'webtorrent'
 import { UserVideoRateType, VideoCaption, VideoPrivacy, VideoRateType, VideoState } from '../../../../../shared'
 import '../../../assets/player/peertube-videojs-plugin'
@@ -21,6 +22,7 @@ import { VideoDownloadComponent } from './modal/video-download.component'
 import { VideoReportComponent } from './modal/video-report.component'
 import { VideoShareComponent } from './modal/video-share.component'
 import { VideoBlacklistComponent } from './modal/video-blacklist.component'
+import { SubscribeButtonComponent } from '@app/shared/user-subscription/subscribe-button.component'
 import { addContextMenu, getVideojsOptions, loadLocaleInVideoJS } from '../../../assets/player/peertube-player'
 import { ServerService } from '@app/core'
 import { I18n } from '@ngx-translate/i18n-polyfill'
@@ -41,6 +43,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   @ViewChild('videoReportModal') videoReportModal: VideoReportComponent
   @ViewChild('videoSupportModal') videoSupportModal: VideoSupportComponent
   @ViewChild('videoBlacklistModal') videoBlacklistModal: VideoBlacklistComponent
+  @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent
 
   player: videojs.Player
   playerElement: HTMLVideoElement
@@ -55,6 +58,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
   likesBarTooltipText = ''
   hasAlreadyAcceptedPrivacyConcern = false
   remoteServerDown = false
+  hotkeys: Hotkey[]
 
   private videojsLocaleLoaded = false
   private paramsSub: Subscription
@@ -77,6 +81,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
     private redirectService: RedirectService,
     private videoCaptionService: VideoCaptionService,
     private i18n: I18n,
+    private hotkeysService: HotkeysService,
     @Inject(LOCALE_ID) private localeId: string
   ) {}
 
@@ -115,6 +120,24 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
               .catch(err => this.handleError(err))
         })
     })
+
+    this.hotkeys = [
+      new Hotkey('L', (event: KeyboardEvent): boolean => {
+        this.setLike()
+        return false
+      }, undefined, 'Like the video'),
+      new Hotkey('D', (event: KeyboardEvent): boolean => {
+        this.setDislike()
+        return false
+      }, undefined, 'Dislike the video'),
+      new Hotkey('S', (event: KeyboardEvent): boolean => {
+        this.subscribeButton.subscribed ?
+          this.subscribeButton.unsubscribe() :
+          this.subscribeButton.subscribe()
+        return false
+      }, undefined, 'Subscribe to the account')
+    ]
+    if (this.isUserLoggedIn()) this.hotkeysService.add(this.hotkeys)
   }
 
   ngOnDestroy () {
@@ -122,6 +145,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
 
     // Unsubscribe subscriptions
     this.paramsSub.unsubscribe()
+
+    // Unbind hotkeys
+    if (this.isUserLoggedIn()) this.hotkeysService.remove(this.hotkeys)
   }
 
   setLike () {