From db84cf89bcb20b5aaa87f4a6d92d41cc0060a089 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 10 Jan 2020 11:14:57 +0100 Subject: Fix client build --- .../subscribe-button.component.html | 8 ++++---- .../user-subscription/subscribe-button.component.ts | 21 +++++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.html b/client/src/app/shared/user-subscription/subscribe-button.component.html index 1c2288ebb..7d33b0621 100644 --- a/client/src/app/shared/user-subscription/subscribe-button.component.html +++ b/client/src/app/shared/user-subscription/subscribe-button.component.html @@ -7,12 +7,12 @@ Subscribe Subscribe to all channels - {{subscribeStatus(true).length}}/{{subscribed.size}} + {{ subscribeStatus(true).length }}/{{ subscribed.size }} channels subscribed - + {{ videoChannels[0].followersCount | myNumberFormatter }} @@ -23,7 +23,7 @@ (click)="subscribe()"> - + - + diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts index 1ebfdc82f..888f6552a 100644 --- a/client/src/app/shared/user-subscription/subscribe-button.component.ts +++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts @@ -40,11 +40,11 @@ export class SubscribeButtonComponent implements OnInit { get handle () { return this.account ? this.account.nameWithHost - : this.videoChannels[0].name + '@' + this.videoChannels[0].host + : this.videoChannel.name + '@' + this.videoChannel.host } get channelHandle () { - return this.getChannelHandler(this.videoChannels[0]) + return this.getChannelHandler(this.videoChannel) } get uri () { @@ -65,6 +65,10 @@ export class SubscribeButtonComponent implements OnInit { return rssFeed.url } + get videoChannel () { + return this.videoChannels[0] + } + ngOnInit () { this.loadSubscribedStatus() } @@ -83,7 +87,7 @@ export class SubscribeButtonComponent implements OnInit { .filter(handle => this.subscribeStatus(false).includes(handle)) .map(handle => this.userSubscriptionService.addSubscription(handle)) - forkJoin(observableBatch) + merge(observableBatch, 2) .subscribe( () => { this.notifier.success( @@ -153,18 +157,19 @@ export class SubscribeButtonComponent implements OnInit { this.router.navigate([ '/login' ]) } - private getChannelHandler (videoChannel: VideoChannel) { - return videoChannel.name + '@' + videoChannel.host - } - - private subscribeStatus (subscribed: boolean) { + subscribeStatus (subscribed: boolean) { const accumulator: string[] = [] for (const [key, value] of this.subscribed.entries()) { if (value === subscribed) accumulator.push(key) } + return accumulator } + private getChannelHandler (videoChannel: VideoChannel) { + return videoChannel.name + '@' + videoChannel.host + } + private loadSubscribedStatus () { if (!this.isUserLoggedIn()) return -- cgit v1.2.3