X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-custom-markup%2Fpeertube-custom-tags%2Fchannel-miniature-markup.component.ts;h=ba12b713945da2d804d5f430b7c44abc6414119b;hb=0e45e336f62a411b3c423be46d16252355c754d7;hp=5bb045a8230ff6dfe60358ed29caafbd39167dd5;hpb=ff4de38385049bf8f6e1d76d8511854fcfabc71c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts index 5bb045a82..ba12b7139 100644 --- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts +++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/channel-miniature-markup.component.ts @@ -3,8 +3,8 @@ import { finalize, map, switchMap, tap } from 'rxjs/operators' import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core' import { MarkdownService, Notifier, UserService } from '@app/core' import { FindInBulkService } from '@app/shared/shared-search' -import { Video, VideoSortField } from '@shared/models/videos' -import { VideoChannel, VideoService } from '../../shared-main' +import { VideoSortField } from '@shared/models' +import { Video, VideoChannel, VideoService } from '../../shared-main' import { CustomMarkupComponent } from './shared' /* @@ -39,19 +39,27 @@ export class ChannelMiniatureMarkupComponent implements CustomMarkupComponent, O ngOnInit () { this.findInBulk.getChannel(this.name) .pipe( - tap(channel => this.channel = channel), - switchMap(() => from(this.markdown.textMarkdownToHTML(this.channel.description))), - tap(html => this.descriptionHTML = html), + tap(channel => { + this.channel = channel + }), + switchMap(() => from(this.markdown.textMarkdownToHTML({ + markdown: this.channel.description, + withEmoji: true, + withHtml: true + }))), + tap(html => { + this.descriptionHTML = html + }), switchMap(() => this.loadVideosObservable()), finalize(() => this.loaded.emit(true)) - ).subscribe( - ({ total, data }) => { + ).subscribe({ + next: ({ total, data }) => { this.totalVideos = total this.video = data[0] }, - err => this.notifier.error($localize`Error in channel miniature component: ${err.message}`) - ) + error: err => this.notifier.error($localize`Error in channel miniature component: ${err.message}`) + }) } getVideoChannelLink () {