From 77d873c56d112b7b1de4e703b08f7d8547dfb9fd Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 12 Jul 2021 10:03:46 +0200 Subject: Fix subscribe hotkey --- client/src/app/+videos/+video-watch/video-watch.component.ts | 5 ++++- .../shared/shared-user-subscription/subscribe-button.component.ts | 4 ++++ server/tests/api/videos/videos-overview.ts | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) 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 85b882225..d078844c3 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.ts +++ b/client/src/app/+videos/+video-watch/video-watch.component.ts @@ -696,7 +696,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { if (this.isUserLoggedIn()) { this.hotkeys = this.hotkeys.concat([ new Hotkey('shift+s', () => { - this.subscribeButton.subscribed ? this.subscribeButton.unsubscribe() : this.subscribeButton.subscribe() + this.subscribeButton.isSubscribedToAll() + ? this.subscribeButton.unsubscribe() + : this.subscribeButton.subscribe() + return false }, undefined, $localize`Subscribe to the account`) ]) diff --git a/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts b/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts index b918fda06..2261e07dd 100644 --- a/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts +++ b/client/src/app/shared/shared-user-subscription/subscribe-button.component.ts @@ -164,6 +164,10 @@ export class SubscribeButtonComponent implements OnInit, OnChanges { return accumulator } + isSubscribedToAll () { + return Array.from(this.subscribed.values()).every(v => v === true) + } + private getChannelHandler (videoChannel: VideoChannel) { return videoChannel.name + '@' + videoChannel.host } diff --git a/server/tests/api/videos/videos-overview.ts b/server/tests/api/videos/videos-overview.ts index 7889bcf80..b4de7c06c 100644 --- a/server/tests/api/videos/videos-overview.ts +++ b/server/tests/api/videos/videos-overview.ts @@ -45,7 +45,7 @@ describe('Test a videos overview', function () { }) it('Should upload 5 videos in a specific category, tag and channel but not include them in overview', async function () { - this.timeout(15000) + this.timeout(30000) await wait(3000) -- cgit v1.2.3