X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-watch%2Fcomment%2Fvideo-comment.service.ts;h=0bf7696fe0489bd1cafb4c132a049f1312e69110;hb=169310b288ea4ecfd0a664bc0829b404e1cc7bc2;hp=14d32b1aa6f1732e2e17a59230d385c1aab8800c;hpb=5de8a55abce53108bc1024f1194457c6528bd11e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/videos/+video-watch/comment/video-comment.service.ts b/client/src/app/videos/+video-watch/comment/video-comment.service.ts index 14d32b1aa..0bf7696fe 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.service.ts +++ b/client/src/app/videos/+video-watch/comment/video-comment.service.ts @@ -1,18 +1,20 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' +import { lineFeedToHtml } from '@app/shared/misc/utils' +import { MarkdownService } from '@app/videos/shared' import 'rxjs/add/operator/catch' import 'rxjs/add/operator/map' -import { immutableAssign, lineFeedToHtml } from '@app/shared/misc/utils' import { Observable } from 'rxjs/Observable' import { ResultList } from '../../../../../../shared/models' import { - VideoComment as VideoCommentServerModel, VideoCommentCreate, + VideoComment as VideoCommentServerModel, + VideoCommentCreate, VideoCommentThreadTree } from '../../../../../../shared/models/videos/video-comment.model' import { environment } from '../../../../environments/environment' import { RestExtractor, RestService } from '../../../shared/rest' import { ComponentPagination } from '../../../shared/rest/component-pagination.model' -import { SortField } from '../../../shared/video/sort-field.type' +import { VideoSortField } from '../../../shared/video/sort-field.type' import { VideoComment } from './video-comment.model' @Injectable() @@ -46,7 +48,7 @@ export class VideoCommentService { getVideoCommentThreads ( videoId: number | string, componentPagination: ComponentPagination, - sort: SortField + sort: VideoSortField ): Observable<{ comments: VideoComment[], totalComments: number}> { const pagination = this.restService.componentPaginationToRestPagination(componentPagination)