X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bvideo-channels%2Fvideo-channels.component.ts;h=3833d9c542c03a0509020d5e3c76b6b6914e0615;hb=24893b524c47b8f89090192aa38126352a952808;hp=ea8bda1cf7df5c22653d24e44438e338132d462f;hpb=66357162f8e1227495f09bd4f68446aad7071c6d;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 ea8bda1cf..3833d9c54 100644 --- a/client/src/app/+video-channels/video-channels.component.ts +++ b/client/src/app/+video-channels/video-channels.component.ts @@ -3,9 +3,11 @@ import { Subscription } from 'rxjs' import { catchError, distinctUntilChanged, map, switchMap } from 'rxjs/operators' import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute } from '@angular/router' -import { AuthService, Notifier, RestExtractor, ScreenService } from '@app/core' -import { ListOverflowItem, VideoChannel, VideoChannelService } from '@app/shared/shared-main' +import { AuthService, MarkdownService, Notifier, RestExtractor, ScreenService } from '@app/core' +import { ListOverflowItem, VideoChannel, VideoChannelService, VideoService } from '@app/shared/shared-main' +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' @Component({ templateUrl: './video-channels.component.html', @@ -13,12 +15,18 @@ import { SubscribeButtonComponent } from '@app/shared/shared-user-subscription' }) export class VideoChannelsComponent implements OnInit, OnDestroy { @ViewChild('subscribeButton') subscribeButton: SubscribeButtonComponent + @ViewChild('supportModal') supportModal: SupportModalComponent videoChannel: VideoChannel hotkeys: Hotkey[] links: ListOverflowItem[] = [] isChannelManageable = false + channelVideosCount: number + ownerDescriptionHTML = '' + channelDescriptionHTML = '' + channelDescriptionExpanded = false + private routeSub: Subscription constructor ( @@ -26,9 +34,11 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { private notifier: Notifier, private authService: AuthService, private videoChannelService: VideoChannelService, + private videoService: VideoService, private restExtractor: RestExtractor, private hotkeysService: HotkeysService, - private screenService: ScreenService + private screenService: ScreenService, + private markdown: MarkdownService ) { } ngOnInit () { @@ -37,18 +47,19 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { map(params => params[ 'videoChannelName' ]), distinctUntilChanged(), switchMap(videoChannelName => this.videoChannelService.getVideoChannel(videoChannelName)), - catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])) + catchError(err => this.restExtractor.redirectTo404IfNotFound(err, 'other', [ + HttpStatusCode.BAD_REQUEST_400, + HttpStatusCode.NOT_FOUND_404 + ])) ) - .subscribe(videoChannel => { + .subscribe(async videoChannel => { + this.channelDescriptionHTML = await this.markdown.textMarkdownToHTML(videoChannel.description) + this.ownerDescriptionHTML = await this.markdown.textMarkdownToHTML(videoChannel.ownerAccount.description) + + // After the markdown renderer to avoid layout changes this.videoChannel = videoChannel - if (this.authService.isLoggedIn()) { - this.authService.userInformationLoaded - .subscribe(() => { - const channelUserId = this.videoChannel.ownerAccount.userId - this.isChannelManageable = channelUserId && channelUserId === this.authService.getUser().id - }) - } + this.loadChannelVideosCount() }) this.hotkeys = [ @@ -63,8 +74,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { this.links = [ { label: $localize`VIDEOS`, routerLink: 'videos' }, - { label: $localize`VIDEO PLAYLISTS`, routerLink: 'video-playlists' }, - { label: $localize`ABOUT`, routerLink: 'about' } + { label: $localize`PLAYLISTS`, routerLink: 'video-playlists' } ] } @@ -75,7 +85,7 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { if (this.isUserLoggedIn()) this.hotkeysService.remove(this.hotkeys) } - get isInSmallView () { + isInSmallView () { return this.screenService.isInSmallView() } @@ -83,12 +93,36 @@ export class VideoChannelsComponent implements OnInit, OnDestroy { return this.authService.isLoggedIn() } - get isManageable () { + isManageable () { if (!this.isUserLoggedIn()) return false - return this.videoChannel.ownerAccount.userId === this.authService.getUser().id + + return this.videoChannel?.ownerAccount.userId === this.authService.getUser().id } activateCopiedMessage () { this.notifier.success($localize`Username copied`) } + + hasShowMoreDescription () { + return !this.channelDescriptionExpanded && this.channelDescriptionHTML.length > 100 + } + + showSupportModal () { + this.supportModal.show() + } + + getAccountUrl () { + return [ '/a', this.videoChannel.ownerBy ] + } + + private loadChannelVideosCount () { + this.videoService.getVideoChannelVideos({ + videoChannel: this.videoChannel, + videoPagination: { + currentPage: 1, + itemsPerPage: 0 + }, + sort: '-publishedAt' + }).subscribe(res => this.channelVideosCount = res.total) + } }