diff options
author | Chocobozzz <me@florianbigard.com> | 2020-11-25 11:04:18 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-11-25 11:07:56 +0100 |
commit | 18490b07650d77d7fe376970b749af5a8c672fd6 (patch) | |
tree | 89741e63e34c2659487c9afa8309755064cb0c39 /client/src | |
parent | 5beb89f223539f1e415a976ff104f772526b4d20 (diff) | |
download | PeerTube-18490b07650d77d7fe376970b749af5a8c672fd6.tar.gz PeerTube-18490b07650d77d7fe376970b749af5a8c672fd6.tar.zst PeerTube-18490b07650d77d7fe376970b749af5a8c672fd6.zip |
Fix migration and test
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/app/+my-account/my-account-applications/my-account-applications.component.ts | 1 | ||||
-rw-r--r-- | client/src/app/+videos/video-list/video-user-subscriptions.component.ts | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts index 233e42c83..756644990 100644 --- a/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts +++ b/client/src/app/+my-account/my-account-applications/my-account-applications.component.ts | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
3 | import { AuthService, Notifier, ConfirmService, ScopedTokensService } from '@app/core' | 2 | import { AuthService, Notifier, ConfirmService, ScopedTokensService } from '@app/core' |
4 | import { VideoService } from '@app/shared/shared-main' | 3 | import { VideoService } from '@app/shared/shared-main' |
diff --git a/client/src/app/+videos/video-list/video-user-subscriptions.component.ts b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts index 03881c295..bd0337c1d 100644 --- a/client/src/app/+videos/video-list/video-user-subscriptions.component.ts +++ b/client/src/app/+videos/video-list/video-user-subscriptions.component.ts | |||
@@ -1,3 +1,4 @@ | |||
1 | |||
1 | import { Component, OnDestroy, OnInit } from '@angular/core' | 2 | import { Component, OnDestroy, OnInit } from '@angular/core' |
2 | import { ActivatedRoute, Router } from '@angular/router' | 3 | import { ActivatedRoute, Router } from '@angular/router' |
3 | import { AuthService, LocalStorageService, Notifier, ScopedTokensService, ScreenService, ServerService, UserService } from '@app/core' | 4 | import { AuthService, LocalStorageService, Notifier, ScopedTokensService, ScreenService, ServerService, UserService } from '@app/core' |
@@ -6,10 +7,9 @@ import { immutableAssign } from '@app/helpers' | |||
6 | import { VideoService } from '@app/shared/shared-main' | 7 | import { VideoService } from '@app/shared/shared-main' |
7 | import { UserSubscriptionService } from '@app/shared/shared-user-subscription' | 8 | import { UserSubscriptionService } from '@app/shared/shared-user-subscription' |
8 | import { AbstractVideoList, OwnerDisplayType } from '@app/shared/shared-video-miniature' | 9 | import { AbstractVideoList, OwnerDisplayType } from '@app/shared/shared-video-miniature' |
9 | import { VideoSortField, FeedFormat } from '@shared/models' | 10 | import { FeedFormat, VideoSortField } from '@shared/models' |
10 | import { copyToClipboard } from '../../../root-helpers/utils' | ||
11 | import { environment } from '../../../environments/environment' | 11 | import { environment } from '../../../environments/environment' |
12 | import { forkJoin } from 'rxjs' | 12 | import { copyToClipboard } from '../../../root-helpers/utils' |
13 | 13 | ||
14 | @Component({ | 14 | @Component({ |
15 | selector: 'my-videos-user-subscriptions', | 15 | selector: 'my-videos-user-subscriptions', |
@@ -56,7 +56,7 @@ export class VideoUserSubscriptionsComponent extends AbstractVideoList implement | |||
56 | this.scopedTokensService.getScopedTokens().subscribe( | 56 | this.scopedTokensService.getScopedTokens().subscribe( |
57 | tokens => { | 57 | tokens => { |
58 | const feeds = this.videoService.getVideoSubscriptionFeedUrls(user.account.id, tokens.feedToken) | 58 | const feeds = this.videoService.getVideoSubscriptionFeedUrls(user.account.id, tokens.feedToken) |
59 | feedUrl = feedUrl + feeds.find((f: any) => f.format === FeedFormat.RSS).url | 59 | feedUrl = feedUrl + feeds.find(f => f.format === FeedFormat.RSS).url |
60 | }, | 60 | }, |
61 | 61 | ||
62 | err => { | 62 | err => { |