forks/peertube
1
0
Fork 0
Code Releases Activity

Fix subscribe hotkey

Browse source
This commit is contained in:
Chocobozzz 2021-07-12 10:03:46 +02:00
parent 6419509bde
commit 77d873c56d
No known key found for this signature in database
GPG key ID: 583A612D890159BE
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/src/app/+videos/+video-watch/video-watch.component.ts
View file

@ -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`)
])

4
client/src/app/shared/shared-user-subscription/subscribe-button.component.ts
View file

@ -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
}

2
server/tests/api/videos/videos-overview.ts
View file

@ -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)