X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideo-channels%2Fvideo-channels.component.ts;h=ebb991f4ee3a4fd5f63e175b12efc5fc0f5681f5;hb=80badf493afca026bc542260f353210e605a1715;hp=3833d9c542c03a0509020d5e3c76b6b6914e0615;hpb=d6d96bed80700830063c6055969d2d2ff46c63c6;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+video-channels/video-channels.component.ts b/client/src/app/+video-channels/video-channels.component.ts index 3833d9c54..ebb991f4e 100644 --- a/client/src/app/+video-channels/video-channels.component.ts +++ b/client/src/app/+video-channels/video-channels.component.ts @@ -4,10 +4,11 @@ import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute } from '@angular/router' import { AuthService, MarkdownService, Notifier, RestExtractor, ScreenService } from '@app/core' -import { ListOverflowItem, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main' +import { Account, ListOverflowItem, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main' +import { BlocklistService } from '@app/shared/shared-moderation' import { SupportModalComponent } from '@app/shared/shared-support-modal' import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' -import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' +import { HttpStatusCode } from '@shared/models' @Component({ templateUrl: './video-channels.component.html', @@ -18,6 +19,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { @ViewChild('supportModal') supportModal: SupportModalComponent videoChannel: VideoChannel + ownerAccount: Account hotkeys: Hotkey[] links: ListOverflowItem[] = [] isChannelManageable = false @@ -38,13 +40,14 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { private restExtractor: RestExtractor, private hotkeysService: HotkeysService, private screenService: ScreenService, - private markdown: MarkdownService + private markdown: MarkdownService, + private blocklist: BlocklistService ) { } ngOnInit () { this.routeSub = this.route.params .pipe( - map(params => params[ 'videoChannelName' ]), + map(params => params['videoChannelName']), distinctUntilChanged(), switchMap(videoChannelName => this.videoChannelService.getVideoChannel(videoChannelName)), catchError(err => this.restExtractor.redirectTo404IfNotFound(err, 'other', [ @@ -58,15 +61,17 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { // After the markdown renderer to avoid layout changes this.videoChannel = videoChannel + this.ownerAccount = new Account(this.videoChannel.ownerAccount) this.loadChannelVideosCount() + this.loadOwnerBlockStatus() }) this.hotkeys = [ new Hotkey('S', (event: KeyboardEvent): boolean => { - this.subscribeButton.subscribed ? - this.subscribeButton.unsubscribe() : - this.subscribeButton.subscribe() + if (this.subscribeButton.subscribed) this.subscribeButton.unsubscribe() + else this.subscribeButton.subscribe() + return false }, undefined, $localize`Subscribe to the account`) ] @@ -125,4 +130,9 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { sort: '-publishedAt' }).subscribe(res => this.channelVideosCount = res.total) } + + private loadOwnerBlockStatus () { + this.blocklist.getStatus({ accounts: [ this.ownerAccount.nameWithHostForced ], hosts: [ this.ownerAccount.host ] }) + .subscribe(status => this.ownerAccount.updateBlockStatus(status)) + } }