From cc1561f9f7b33d739d66b23bacae23ea49f2fa12 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 17 Apr 2018 10:35:08 +0200 Subject: Simplify client syndications --- .../src/app/videos/+video-watch/video-watch.component.ts | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'client/src/app/videos/+video-watch') diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index b3ebe3e4b..182703cdf 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild, OnChanges } from '@angular/core' +import { Component, ElementRef, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' import { RedirectService } from '@app/core/routing/redirect.service' import { peertubeLocalStorage } from '@app/shared/misc/peertube-local-storage' @@ -9,20 +9,18 @@ import { Subscription } from 'rxjs/Subscription' import * as videojs from 'video.js' import 'videojs-hotkeys' import * as WebTorrent from 'webtorrent' -import { UserVideoRateType, VideoRateType, FeedFormat } from '../../../../../shared' +import { UserVideoRateType, VideoRateType } from '../../../../../shared' import '../../../assets/player/peertube-videojs-plugin' import { AuthService, ConfirmService } from '../../core' import { VideoBlacklistService } from '../../shared' import { Account } from '../../shared/account/account.model' import { VideoDetails } from '../../shared/video/video-details.model' -import { VideoFeedComponent } from '../../shared/video/video-feed.component' import { Video } from '../../shared/video/video.model' import { VideoService } from '../../shared/video/video.service' import { MarkdownService } from '../shared' import { VideoDownloadComponent } from './modal/video-download.component' import { VideoReportComponent } from './modal/video-report.component' import { VideoShareComponent } from './modal/video-share.component' -import { environment } from '../../../environments/environment' import { getVideojsOptions } from '../../../assets/player/peertube-player' @Component({ @@ -248,13 +246,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy { } generateSyndicationList () { - const feeds = this.videoService.getAccountFeed( - this.video.account.id, - (this.video.isLocal) ? environment.apiUrl : this.video.account.host - ) - this.syndicationItems['rss 2.0'] = feeds[FeedFormat.RSS] - this.syndicationItems['atom 1.0'] = feeds[FeedFormat.ATOM] - this.syndicationItems['json 1.0'] = feeds[FeedFormat.JSON] + this.syndicationItems = this.videoService.getAccountFeedUrls(this.video.account.id) } isVideoRemovable () { -- cgit v1.2.3