diff options
25 files changed, 13 insertions, 75 deletions
diff --git a/client/src/app/+accounts/account-about/account-about.component.ts b/client/src/app/+accounts/account-about/account-about.component.ts index 2acf67a59..6f3e6caa0 100644 --- a/client/src/app/+accounts/account-about/account-about.component.ts +++ b/client/src/app/+accounts/account-about/account-about.component.ts | |||
@@ -1,5 +1,4 @@ | |||
1 | import { Component, OnInit, OnDestroy } from '@angular/core' | 1 | import { Component, OnInit, OnDestroy } from '@angular/core' |
2 | import { ActivatedRoute } from '@angular/router' | ||
3 | import { Account } from '@app/shared/account/account.model' | 2 | import { Account } from '@app/shared/account/account.model' |
4 | import { AccountService } from '@app/shared/account/account.service' | 3 | import { AccountService } from '@app/shared/account/account.service' |
5 | import { I18n } from '@ngx-translate/i18n-polyfill' | 4 | import { I18n } from '@ngx-translate/i18n-polyfill' |
@@ -18,7 +17,6 @@ export class AccountAboutComponent implements OnInit, OnDestroy { | |||
18 | private accountSub: Subscription | 17 | private accountSub: Subscription |
19 | 18 | ||
20 | constructor ( | 19 | constructor ( |
21 | private route: ActivatedRoute, | ||
22 | private i18n: I18n, | 20 | private i18n: I18n, |
23 | private accountService: AccountService, | 21 | private accountService: AccountService, |
24 | private markdownService: MarkdownService | 22 | private markdownService: MarkdownService |
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index ce2ea8a6c..9b3bd86f1 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -1,5 +1,4 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
2 | import { Router } from '@angular/router' | ||
3 | import { ConfigService } from '@app/+admin/config/shared/config.service' | 2 | import { ConfigService } from '@app/+admin/config/shared/config.service' |
4 | import { ConfirmService } from '@app/core' | 3 | import { ConfirmService } from '@app/core' |
5 | import { ServerService } from '@app/core/server/server.service' | 4 | import { ServerService } from '@app/core/server/server.service' |
@@ -54,7 +53,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
54 | protected formValidatorService: FormValidatorService, | 53 | protected formValidatorService: FormValidatorService, |
55 | private customConfigValidatorsService: CustomConfigValidatorsService, | 54 | private customConfigValidatorsService: CustomConfigValidatorsService, |
56 | private userValidatorsService: UserValidatorsService, | 55 | private userValidatorsService: UserValidatorsService, |
57 | private router: Router, | ||
58 | private notificationsService: NotificationsService, | 56 | private notificationsService: NotificationsService, |
59 | private configService: ConfigService, | 57 | private configService: ConfigService, |
60 | private serverService: ServerService, | 58 | private serverService: ServerService, |
diff --git a/client/src/app/+admin/config/shared/config.service.ts b/client/src/app/+admin/config/shared/config.service.ts index 1565774b3..7c61fe9e7 100644 --- a/client/src/app/+admin/config/shared/config.service.ts +++ b/client/src/app/+admin/config/shared/config.service.ts | |||
@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http' | |||
3 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
4 | import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' | 4 | import { CustomConfig } from '../../../../../../shared/models/server/custom-config.model' |
5 | import { environment } from '../../../../environments/environment' | 5 | import { environment } from '../../../../environments/environment' |
6 | import { RestExtractor, RestService } from '../../../shared' | 6 | import { RestExtractor } from '../../../shared' |
7 | 7 | ||
8 | @Injectable() | 8 | @Injectable() |
9 | export class ConfigService { | 9 | export class ConfigService { |
@@ -11,7 +11,6 @@ export class ConfigService { | |||
11 | 11 | ||
12 | constructor ( | 12 | constructor ( |
13 | private authHttp: HttpClient, | 13 | private authHttp: HttpClient, |
14 | private restService: RestService, | ||
15 | private restExtractor: RestExtractor | 14 | private restExtractor: RestExtractor |
16 | ) {} | 15 | ) {} |
17 | 16 | ||
diff --git a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts index ff4725e91..6d77a0eb4 100644 --- a/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts +++ b/client/src/app/+admin/follows/shared/redundancy-checkbox.component.ts | |||
@@ -1,7 +1,4 @@ | |||
1 | import { Component, Input } from '@angular/core' | 1 | import { Component, Input } from '@angular/core' |
2 | import { AuthService } from '@app/core' | ||
3 | import { RestExtractor } from '@app/shared/rest' | ||
4 | import { RedirectService } from '@app/core/routing/redirect.service' | ||
5 | import { NotificationsService } from 'angular2-notifications' | 2 | import { NotificationsService } from 'angular2-notifications' |
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 3 | import { I18n } from '@ngx-translate/i18n-polyfill' |
7 | import { RedundancyService } from '@app/+admin/follows/shared/redundancy.service' | 4 | import { RedundancyService } from '@app/+admin/follows/shared/redundancy.service' |
@@ -16,9 +13,6 @@ export class RedundancyCheckboxComponent { | |||
16 | @Input() host: string | 13 | @Input() host: string |
17 | 14 | ||
18 | constructor ( | 15 | constructor ( |
19 | private authService: AuthService, | ||
20 | private restExtractor: RestExtractor, | ||
21 | private redirectService: RedirectService, | ||
22 | private notificationsService: NotificationsService, | 16 | private notificationsService: NotificationsService, |
23 | private redundancyService: RedundancyService, | 17 | private redundancyService: RedundancyService, |
24 | private i18n: I18n | 18 | private i18n: I18n |
diff --git a/client/src/app/+admin/follows/shared/redundancy.service.ts b/client/src/app/+admin/follows/shared/redundancy.service.ts index 96b29faab..87ae01c04 100644 --- a/client/src/app/+admin/follows/shared/redundancy.service.ts +++ b/client/src/app/+admin/follows/shared/redundancy.service.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { catchError, map } from 'rxjs/operators' | 1 | import { catchError, map } from 'rxjs/operators' |
2 | import { HttpClient } from '@angular/common/http' | 2 | import { HttpClient } from '@angular/common/http' |
3 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
4 | import { RestExtractor, RestService } from '@app/shared' | 4 | import { RestExtractor } from '@app/shared' |
5 | import { environment } from '../../../../environments/environment' | 5 | import { environment } from '../../../../environments/environment' |
6 | 6 | ||
7 | @Injectable() | 7 | @Injectable() |
@@ -10,8 +10,7 @@ export class RedundancyService { | |||
10 | 10 | ||
11 | constructor ( | 11 | constructor ( |
12 | private authHttp: HttpClient, | 12 | private authHttp: HttpClient, |
13 | private restExtractor: RestExtractor, | 13 | private restExtractor: RestExtractor |
14 | private restService: RestService | ||
15 | ) { } | 14 | ) { } |
16 | 15 | ||
17 | updateRedundancy (host: string, redundancyAllowed: boolean) { | 16 | updateRedundancy (host: string, redundancyAllowed: boolean) { |
diff --git a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts index 44ab59d36..866ba1b23 100644 --- a/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts +++ b/client/src/app/+admin/jobs/jobs-list/jobs-list.component.ts | |||
@@ -5,7 +5,6 @@ import { SortMeta } from 'primeng/primeng' | |||
5 | import { Job } from '../../../../../../shared/index' | 5 | import { Job } from '../../../../../../shared/index' |
6 | import { JobState } from '../../../../../../shared/models' | 6 | import { JobState } from '../../../../../../shared/models' |
7 | import { RestPagination, RestTable } from '../../../shared' | 7 | import { RestPagination, RestTable } from '../../../shared' |
8 | import { RestExtractor } from '../../../shared/rest/rest-extractor.service' | ||
9 | import { JobService } from '../shared' | 8 | import { JobService } from '../shared' |
10 | import { I18n } from '@ngx-translate/i18n-polyfill' | 9 | import { I18n } from '@ngx-translate/i18n-polyfill' |
11 | 10 | ||
@@ -27,7 +26,6 @@ export class JobsListComponent extends RestTable implements OnInit { | |||
27 | 26 | ||
28 | constructor ( | 27 | constructor ( |
29 | private notificationsService: NotificationsService, | 28 | private notificationsService: NotificationsService, |
30 | private restExtractor: RestExtractor, | ||
31 | private jobsService: JobService, | 29 | private jobsService: JobService, |
32 | private i18n: I18n | 30 | private i18n: I18n |
33 | ) { | 31 | ) { |
diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index 9697ce202..100ffc00e 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts | |||
@@ -25,7 +25,6 @@ export class UserListComponent extends RestTable implements OnInit { | |||
25 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } | 25 | pagination: RestPagination = { count: this.rowsPerPage, start: 0 } |
26 | userActions: DropdownAction<User>[] = [] | 26 | userActions: DropdownAction<User>[] = [] |
27 | 27 | ||
28 | private userToBan: User | ||
29 | private openedModal: NgbModalRef | 28 | private openedModal: NgbModalRef |
30 | 29 | ||
31 | constructor ( | 30 | constructor ( |
@@ -63,7 +62,6 @@ export class UserListComponent extends RestTable implements OnInit { | |||
63 | } | 62 | } |
64 | 63 | ||
65 | hideBanUserModal () { | 64 | hideBanUserModal () { |
66 | this.userToBan = undefined | ||
67 | this.openedModal.close() | 65 | this.openedModal.close() |
68 | } | 66 | } |
69 | 67 | ||
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts index 164a46a48..62053d97b 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.ts | |||
@@ -2,7 +2,6 @@ import { Component, OnInit, ViewChild } from '@angular/core' | |||
2 | import { NotificationsService } from 'angular2-notifications' | 2 | import { NotificationsService } from 'angular2-notifications' |
3 | import { BytesPipe } from 'ngx-pipes' | 3 | import { BytesPipe } from 'ngx-pipes' |
4 | import { AuthService } from '../../core' | 4 | import { AuthService } from '../../core' |
5 | import { ServerService } from '../../core/server' | ||
6 | import { User } from '../../shared' | 5 | import { User } from '../../shared' |
7 | import { UserService } from '../../shared/users' | 6 | import { UserService } from '../../shared/users' |
8 | import { I18n } from '@ngx-translate/i18n-polyfill' | 7 | import { I18n } from '@ngx-translate/i18n-polyfill' |
@@ -20,7 +19,6 @@ export class MyAccountSettingsComponent implements OnInit { | |||
20 | constructor ( | 19 | constructor ( |
21 | private userService: UserService, | 20 | private userService: UserService, |
22 | private authService: AuthService, | 21 | private authService: AuthService, |
23 | private serverService: ServerService, | ||
24 | private notificationsService: NotificationsService, | 22 | private notificationsService: NotificationsService, |
25 | private i18n: I18n | 23 | private i18n: I18n |
26 | ) {} | 24 | ) {} |
diff --git a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts index 31ccb0bc8..d9fb20446 100644 --- a/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts +++ b/client/src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts | |||
@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core' | |||
2 | import { RestPagination, RestTable } from '@app/shared' | 2 | import { RestPagination, RestTable } from '@app/shared' |
3 | import { SortMeta } from 'primeng/components/common/sortmeta' | 3 | import { SortMeta } from 'primeng/components/common/sortmeta' |
4 | import { NotificationsService } from 'angular2-notifications' | 4 | import { NotificationsService } from 'angular2-notifications' |
5 | import { ConfirmService } from '@app/core' | ||
6 | import { I18n } from '@ngx-translate/i18n-polyfill' | 5 | import { I18n } from '@ngx-translate/i18n-polyfill' |
7 | import { VideoImport, VideoImportState } from '../../../../../shared/models/videos' | 6 | import { VideoImport, VideoImportState } from '../../../../../shared/models/videos' |
8 | import { VideoImportService } from '@app/shared/video-import' | 7 | import { VideoImportService } from '@app/shared/video-import' |
@@ -21,7 +20,6 @@ export class MyAccountVideoImportsComponent extends RestTable implements OnInit | |||
21 | 20 | ||
22 | constructor ( | 21 | constructor ( |
23 | private notificationsService: NotificationsService, | 22 | private notificationsService: NotificationsService, |
24 | private confirmService: ConfirmService, | ||
25 | private videoImportService: VideoImportService, | 23 | private videoImportService: VideoImportService, |
26 | private i18n: I18n | 24 | private i18n: I18n |
27 | ) { | 25 | ) { |
diff --git a/client/src/app/+my-account/shared/actor-avatar-info.component.ts b/client/src/app/+my-account/shared/actor-avatar-info.component.ts index e0b25ad33..7b80b1ed4 100644 --- a/client/src/app/+my-account/shared/actor-avatar-info.component.ts +++ b/client/src/app/+my-account/shared/actor-avatar-info.component.ts | |||
@@ -1,7 +1,5 @@ | |||
1 | import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core' | 1 | import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core' |
2 | import { AuthService } from '../../core' | ||
3 | import { ServerService } from '../../core/server' | 2 | import { ServerService } from '../../core/server' |
4 | import { UserService } from '../../shared/users' | ||
5 | import { NotificationsService } from 'angular2-notifications' | 3 | import { NotificationsService } from 'angular2-notifications' |
6 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' | 4 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' |
7 | import { Account } from '@app/shared/account/account.model' | 5 | import { Account } from '@app/shared/account/account.model' |
@@ -19,8 +17,6 @@ export class ActorAvatarInfoComponent { | |||
19 | @Output() avatarChange = new EventEmitter<FormData>() | 17 | @Output() avatarChange = new EventEmitter<FormData>() |
20 | 18 | ||
21 | constructor ( | 19 | constructor ( |
22 | private userService: UserService, | ||
23 | private authService: AuthService, | ||
24 | private serverService: ServerService, | 20 | private serverService: ServerService, |
25 | private notificationsService: NotificationsService | 21 | private notificationsService: NotificationsService |
26 | ) {} | 22 | ) {} |
diff --git a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts index 901c91de9..ea7b0e118 100644 --- a/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts +++ b/client/src/app/+video-channels/video-channel-about/video-channel-about.component.ts | |||
@@ -1,5 +1,4 @@ | |||
1 | import { Component, OnDestroy, OnInit } from '@angular/core' | 1 | import { Component, OnDestroy, OnInit } from '@angular/core' |
2 | import { ActivatedRoute } from '@angular/router' | ||
3 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' | 2 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' |
4 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' | 3 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' |
5 | import { I18n } from '@ngx-translate/i18n-polyfill' | 4 | import { I18n } from '@ngx-translate/i18n-polyfill' |
@@ -19,7 +18,6 @@ export class VideoChannelAboutComponent implements OnInit, OnDestroy { | |||
19 | private videoChannelSub: Subscription | 18 | private videoChannelSub: Subscription |
20 | 19 | ||
21 | constructor ( | 20 | constructor ( |
22 | private route: ActivatedRoute, | ||
23 | private i18n: I18n, | 21 | private i18n: I18n, |
24 | private videoChannelService: VideoChannelService, | 22 | private videoChannelService: VideoChannelService, |
25 | private markdownService: MarkdownService | 23 | private markdownService: MarkdownService |
diff --git a/client/src/app/core/confirm/confirm.component.ts b/client/src/app/core/confirm/confirm.component.ts index 0d18c38e8..5138b7848 100644 --- a/client/src/app/core/confirm/confirm.component.ts +++ b/client/src/app/core/confirm/confirm.component.ts | |||
@@ -26,9 +26,7 @@ export class ConfirmComponent implements OnInit { | |||
26 | private modalService: NgbModal, | 26 | private modalService: NgbModal, |
27 | private confirmService: ConfirmService, | 27 | private confirmService: ConfirmService, |
28 | private i18n: I18n | 28 | private i18n: I18n |
29 | ) { | 29 | ) { } |
30 | // Empty | ||
31 | } | ||
32 | 30 | ||
33 | ngOnInit () { | 31 | ngOnInit () { |
34 | this.confirmService.showConfirm.subscribe( | 32 | this.confirmService.showConfirm.subscribe( |
diff --git a/client/src/app/reset-password/reset-password.component.ts b/client/src/app/reset-password/reset-password.component.ts index cb4a634f1..af1298de6 100644 --- a/client/src/app/reset-password/reset-password.component.ts +++ b/client/src/app/reset-password/reset-password.component.ts | |||
@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core' | |||
2 | import { ActivatedRoute, Router } from '@angular/router' | 2 | import { ActivatedRoute, Router } from '@angular/router' |
3 | import { UserService, UserValidatorsService } from '@app/shared' | 3 | import { UserService, UserValidatorsService } from '@app/shared' |
4 | import { NotificationsService } from 'angular2-notifications' | 4 | import { NotificationsService } from 'angular2-notifications' |
5 | import { AuthService } from '../core' | ||
6 | import { FormReactive } from '../shared' | 5 | import { FormReactive } from '../shared' |
7 | import { I18n } from '@ngx-translate/i18n-polyfill' | 6 | import { I18n } from '@ngx-translate/i18n-polyfill' |
8 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' |
@@ -22,7 +21,6 @@ export class ResetPasswordComponent extends FormReactive implements OnInit { | |||
22 | protected formValidatorService: FormValidatorService, | 21 | protected formValidatorService: FormValidatorService, |
23 | private resetPasswordValidatorsService: ResetPasswordValidatorsService, | 22 | private resetPasswordValidatorsService: ResetPasswordValidatorsService, |
24 | private userValidatorsService: UserValidatorsService, | 23 | private userValidatorsService: UserValidatorsService, |
25 | private authService: AuthService, | ||
26 | private userService: UserService, | 24 | private userService: UserService, |
27 | private notificationsService: NotificationsService, | 25 | private notificationsService: NotificationsService, |
28 | private router: Router, | 26 | private router: Router, |
diff --git a/client/src/app/search/search-filters.component.ts b/client/src/app/search/search-filters.component.ts index f2f001e3f..8d7f84ac1 100644 --- a/client/src/app/search/search-filters.component.ts +++ b/client/src/app/search/search-filters.component.ts | |||
@@ -31,11 +31,6 @@ export class SearchFiltersComponent implements OnInit { | |||
31 | 31 | ||
32 | constructor ( | 32 | constructor ( |
33 | private i18n: I18n, | 33 | private i18n: I18n, |
34 | private route: ActivatedRoute, | ||
35 | private metaService: MetaService, | ||
36 | private redirectService: RedirectService, | ||
37 | private notificationsService: NotificationsService, | ||
38 | private searchService: SearchService, | ||
39 | private serverService: ServerService | 34 | private serverService: ServerService |
40 | ) { | 35 | ) { |
41 | this.publishedDateRanges = [ | 36 | this.publishedDateRanges = [ |
diff --git a/client/src/app/shared/guards/can-deactivate-guard.service.ts b/client/src/app/shared/guards/can-deactivate-guard.service.ts index c038a5c0e..e2a79e8c4 100644 --- a/client/src/app/shared/guards/can-deactivate-guard.service.ts +++ b/client/src/app/shared/guards/can-deactivate-guard.service.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { Injectable } from '@angular/core' | 1 | import { Injectable } from '@angular/core' |
2 | import { ActivatedRouteSnapshot, CanDeactivate, RouterStateSnapshot } from '@angular/router' | 2 | import { CanDeactivate } from '@angular/router' |
3 | import { Observable } from 'rxjs' | 3 | import { Observable } from 'rxjs' |
4 | import { ConfirmService } from '../../core/index' | 4 | import { ConfirmService } from '../../core/index' |
5 | import { I18n } from '@ngx-translate/i18n-polyfill' | 5 | import { I18n } from '@ngx-translate/i18n-polyfill' |
@@ -15,11 +15,7 @@ export class CanDeactivateGuard implements CanDeactivate<CanComponentDeactivate> | |||
15 | private i18n: I18n | 15 | private i18n: I18n |
16 | ) { } | 16 | ) { } |
17 | 17 | ||
18 | canDeactivate (component: CanComponentDeactivate, | 18 | canDeactivate (component: CanComponentDeactivate) { |
19 | currentRoute: ActivatedRouteSnapshot, | ||
20 | currentState: RouterStateSnapshot, | ||
21 | nextState: RouterStateSnapshot | ||
22 | ) { | ||
23 | const result = component.canDeactivate() | 19 | const result = component.canDeactivate() |
24 | const text = result.text || this.i18n('All unsaved data will be lost, are you sure you want to leave this page?') | 20 | const text = result.text || this.i18n('All unsaved data will be lost, are you sure you want to leave this page?') |
25 | 21 | ||
diff --git a/client/src/app/shared/overview/overview.service.ts b/client/src/app/shared/overview/overview.service.ts index 097079e6d..98dba2d97 100644 --- a/client/src/app/shared/overview/overview.service.ts +++ b/client/src/app/shared/overview/overview.service.ts | |||
@@ -5,7 +5,6 @@ import { forkJoin, Observable, of } from 'rxjs' | |||
5 | import { VideosOverview as VideosOverviewServer, peertubeTranslate } from '../../../../../shared/models' | 5 | import { VideosOverview as VideosOverviewServer, peertubeTranslate } from '../../../../../shared/models' |
6 | import { environment } from '../../../environments/environment' | 6 | import { environment } from '../../../environments/environment' |
7 | import { RestExtractor } from '../rest/rest-extractor.service' | 7 | import { RestExtractor } from '../rest/rest-extractor.service' |
8 | import { RestService } from '../rest/rest.service' | ||
9 | import { VideosOverview } from '@app/shared/overview/videos-overview.model' | 8 | import { VideosOverview } from '@app/shared/overview/videos-overview.model' |
10 | import { VideoService } from '@app/shared/video/video.service' | 9 | import { VideoService } from '@app/shared/video/video.service' |
11 | import { ServerService } from '@app/core' | 10 | import { ServerService } from '@app/core' |
@@ -18,7 +17,6 @@ export class OverviewService { | |||
18 | constructor ( | 17 | constructor ( |
19 | private authHttp: HttpClient, | 18 | private authHttp: HttpClient, |
20 | private restExtractor: RestExtractor, | 19 | private restExtractor: RestExtractor, |
21 | private restService: RestService, | ||
22 | private videosService: VideoService, | 20 | private videosService: VideoService, |
23 | private serverService: ServerService | 21 | private serverService: ServerService |
24 | ) {} | 22 | ) {} |
diff --git a/client/src/app/shared/rest/rest-extractor.service.ts b/client/src/app/shared/rest/rest-extractor.service.ts index 0d5b6d6f3..6492aa66d 100644 --- a/client/src/app/shared/rest/rest-extractor.service.ts +++ b/client/src/app/shared/rest/rest-extractor.service.ts | |||
@@ -11,9 +11,7 @@ export class RestExtractor { | |||
11 | constructor ( | 11 | constructor ( |
12 | private router: Router, | 12 | private router: Router, |
13 | private i18n: I18n | 13 | private i18n: I18n |
14 | ) { | 14 | ) { } |
15 | // empty | ||
16 | } | ||
17 | 15 | ||
18 | extractDataBool () { | 16 | extractDataBool () { |
19 | return true | 17 | return true |
diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.ts b/client/src/app/shared/user-subscription/subscribe-button.component.ts index ba7acf69a..b5873a2ee 100644 --- a/client/src/app/shared/user-subscription/subscribe-button.component.ts +++ b/client/src/app/shared/user-subscription/subscribe-button.component.ts | |||
@@ -1,7 +1,4 @@ | |||
1 | import { Component, Input, OnInit } from '@angular/core' | 1 | import { Component, Input, OnInit } from '@angular/core' |
2 | import { AuthService } from '@app/core' | ||
3 | import { RestExtractor } from '@app/shared/rest' | ||
4 | import { RedirectService } from '@app/core/routing/redirect.service' | ||
5 | import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service' | 2 | import { UserSubscriptionService } from '@app/shared/user-subscription/user-subscription.service' |
6 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' | 3 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' |
7 | import { NotificationsService } from 'angular2-notifications' | 4 | import { NotificationsService } from 'angular2-notifications' |
@@ -20,9 +17,6 @@ export class SubscribeButtonComponent implements OnInit { | |||
20 | subscribed: boolean | 17 | subscribed: boolean |
21 | 18 | ||
22 | constructor ( | 19 | constructor ( |
23 | private authService: AuthService, | ||
24 | private restExtractor: RestExtractor, | ||
25 | private redirectService: RedirectService, | ||
26 | private notificationsService: NotificationsService, | 20 | private notificationsService: NotificationsService, |
27 | private userSubscriptionService: UserSubscriptionService, | 21 | private userSubscriptionService: UserSubscriptionService, |
28 | private i18n: I18n | 22 | private i18n: I18n |
diff --git a/client/src/app/shared/video-caption/video-caption.service.ts b/client/src/app/shared/video-caption/video-caption.service.ts index 08fd61265..a1838ab16 100644 --- a/client/src/app/shared/video-caption/video-caption.service.ts +++ b/client/src/app/shared/video-caption/video-caption.service.ts | |||
@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http' | |||
3 | import { Injectable } from '@angular/core' | 3 | import { Injectable } from '@angular/core' |
4 | import { forkJoin, Observable, of } from 'rxjs' | 4 | import { forkJoin, Observable, of } from 'rxjs' |
5 | import { peertubeTranslate, ResultList } from '../../../../../shared' | 5 | import { peertubeTranslate, ResultList } from '../../../../../shared' |
6 | import { RestExtractor, RestService } from '../rest' | 6 | import { RestExtractor } from '../rest' |
7 | import { VideoService } from '@app/shared/video/video.service' | 7 | import { VideoService } from '@app/shared/video/video.service' |
8 | import { objectToFormData, sortBy } from '@app/shared/misc/utils' | 8 | import { objectToFormData, sortBy } from '@app/shared/misc/utils' |
9 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | 9 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' |
@@ -15,7 +15,6 @@ export class VideoCaptionService { | |||
15 | constructor ( | 15 | constructor ( |
16 | private authHttp: HttpClient, | 16 | private authHttp: HttpClient, |
17 | private serverService: ServerService, | 17 | private serverService: ServerService, |
18 | private restService: RestService, | ||
19 | private restExtractor: RestExtractor | 18 | private restExtractor: RestExtractor |
20 | ) {} | 19 | ) {} |
21 | 20 | ||
diff --git a/client/src/app/signup/signup.component.ts b/client/src/app/signup/signup.component.ts index 16e444678..cf2657b85 100644 --- a/client/src/app/signup/signup.component.ts +++ b/client/src/app/signup/signup.component.ts | |||
@@ -1,5 +1,4 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component, OnInit } from '@angular/core' |
2 | import { Router } from '@angular/router' | ||
3 | import { NotificationsService } from 'angular2-notifications' | 2 | import { NotificationsService } from 'angular2-notifications' |
4 | import { UserCreate } from '../../../../shared' | 3 | import { UserCreate } from '../../../../shared' |
5 | import { FormReactive, UserService, UserValidatorsService } from '../shared' | 4 | import { FormReactive, UserService, UserValidatorsService } from '../shared' |
@@ -18,7 +17,6 @@ export class SignupComponent extends FormReactive implements OnInit { | |||
18 | constructor ( | 17 | constructor ( |
19 | protected formValidatorService: FormValidatorService, | 18 | protected formValidatorService: FormValidatorService, |
20 | private userValidatorsService: UserValidatorsService, | 19 | private userValidatorsService: UserValidatorsService, |
21 | private router: Router, | ||
22 | private notificationsService: NotificationsService, | 20 | private notificationsService: NotificationsService, |
23 | private userService: UserService, | 21 | private userService: UserService, |
24 | private serverService: ServerService, | 22 | private serverService: ServerService, |
diff --git a/client/src/app/videos/+video-edit/video-update.component.ts b/client/src/app/videos/+video-edit/video-update.component.ts index 75b11f46c..856e61530 100644 --- a/client/src/app/videos/+video-edit/video-update.component.ts +++ b/client/src/app/videos/+video-edit/video-update.component.ts | |||
@@ -5,11 +5,9 @@ import { LoadingBarService } from '@ngx-loading-bar/core' | |||
5 | import { NotificationsService } from 'angular2-notifications' | 5 | import { NotificationsService } from 'angular2-notifications' |
6 | import { VideoConstant, VideoPrivacy } from '../../../../../shared/models/videos' | 6 | import { VideoConstant, VideoPrivacy } from '../../../../../shared/models/videos' |
7 | import { ServerService } from '../../core' | 7 | import { ServerService } from '../../core' |
8 | import { AuthService } from '../../core/auth' | ||
9 | import { FormReactive } from '../../shared' | 8 | import { FormReactive } from '../../shared' |
10 | import { VideoEdit } from '../../shared/video/video-edit.model' | 9 | import { VideoEdit } from '../../shared/video/video-edit.model' |
11 | import { VideoService } from '../../shared/video/video.service' | 10 | import { VideoService } from '../../shared/video/video.service' |
12 | import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' | ||
13 | import { I18n } from '@ngx-translate/i18n-polyfill' | 11 | import { I18n } from '@ngx-translate/i18n-polyfill' |
14 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 12 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' |
15 | import { VideoCaptionService } from '@app/shared/video-caption' | 13 | import { VideoCaptionService } from '@app/shared/video-caption' |
@@ -38,9 +36,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { | |||
38 | private notificationsService: NotificationsService, | 36 | private notificationsService: NotificationsService, |
39 | private serverService: ServerService, | 37 | private serverService: ServerService, |
40 | private videoService: VideoService, | 38 | private videoService: VideoService, |
41 | private authService: AuthService, | ||
42 | private loadingBar: LoadingBarService, | 39 | private loadingBar: LoadingBarService, |
43 | private videoChannelService: VideoChannelService, | ||
44 | private videoCaptionService: VideoCaptionService, | 40 | private videoCaptionService: VideoCaptionService, |
45 | private i18n: I18n | 41 | private i18n: I18n |
46 | ) { | 42 | ) { |
diff --git a/client/src/app/videos/+video-watch/modal/video-share.component.ts b/client/src/app/videos/+video-watch/modal/video-share.component.ts index 71d6f5633..17e2b31e1 100644 --- a/client/src/app/videos/+video-watch/modal/video-share.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-share.component.ts | |||
@@ -25,9 +25,7 @@ export class VideoShareComponent { | |||
25 | private modalService: NgbModal, | 25 | private modalService: NgbModal, |
26 | private notificationsService: NotificationsService, | 26 | private notificationsService: NotificationsService, |
27 | private i18n: I18n | 27 | private i18n: I18n |
28 | ) { | 28 | ) { } |
29 | // empty | ||
30 | } | ||
31 | 29 | ||
32 | show (currentVideoTimestamp?: number) { | 30 | show (currentVideoTimestamp?: number) { |
33 | this.currentVideoTimestamp = Math.floor(currentVideoTimestamp) | 31 | this.currentVideoTimestamp = Math.floor(currentVideoTimestamp) |
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/videos/+video-watch/modal/video-support.component.ts index 2d400e0be..154002120 100644 --- a/client/src/app/videos/+video-watch/modal/video-support.component.ts +++ b/client/src/app/videos/+video-watch/modal/video-support.component.ts | |||
@@ -19,9 +19,7 @@ export class VideoSupportComponent { | |||
19 | constructor ( | 19 | constructor ( |
20 | private markdownService: MarkdownService, | 20 | private markdownService: MarkdownService, |
21 | private modalService: NgbModal | 21 | private modalService: NgbModal |
22 | ) { | 22 | ) { } |
23 | // empty | ||
24 | } | ||
25 | 23 | ||
26 | show () { | 24 | show () { |
27 | this.videoHTMLSupport = this.markdownService.enhancedMarkdownToHTML(this.video.support) | 25 | this.videoHTMLSupport = this.markdownService.enhancedMarkdownToHTML(this.video.support) |
diff --git a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts b/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts index 0ee34b9cb..59acf17bc 100644 --- a/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts +++ b/client/src/app/videos/recommendations/recent-videos-recommendation.service.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Inject, Injectable } from '@angular/core' | 1 | import { Injectable } from '@angular/core' |
2 | import { RecommendationService } from '@app/videos/recommendations/recommendations.service' | 2 | import { RecommendationService } from '@app/videos/recommendations/recommendations.service' |
3 | import { Video } from '@app/shared/video/video.model' | 3 | import { Video } from '@app/shared/video/video.model' |
4 | import { RecommendationInfo } from '@app/shared/video/recommendation-info.model' | 4 | import { RecommendationInfo } from '@app/shared/video/recommendation-info.model' |
@@ -19,8 +19,7 @@ export class RecentVideosRecommendationService implements RecommendationService | |||
19 | constructor ( | 19 | constructor ( |
20 | private videos: VideoService, | 20 | private videos: VideoService, |
21 | private searchService: SearchService | 21 | private searchService: SearchService |
22 | ) { | 22 | ) { } |
23 | } | ||
24 | 23 | ||
25 | getRecommendations (recommendation: RecommendationInfo): Observable<Video[]> { | 24 | getRecommendations (recommendation: RecommendationInfo): Observable<Video[]> { |
26 | return this.fetchPage(1, recommendation) | 25 | return this.fetchPage(1, recommendation) |
diff --git a/client/src/assets/player/theater-button.ts b/client/src/assets/player/theater-button.ts index bad737eda..5cf0b6425 100644 --- a/client/src/assets/player/theater-button.ts +++ b/client/src/assets/player/theater-button.ts | |||
@@ -1,6 +1,5 @@ | |||
1 | import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' | 1 | import { VideoJSComponentInterface, videojsUntyped } from './peertube-videojs-typings' |
2 | import { saveTheaterInStore } from './peertube-player-local-storage' | 2 | import { saveTheaterInStore, getStoredTheater } from './peertube-player-local-storage' |
3 | import { getStoredTheater } from './peertube-player-local-storage' | ||
4 | 3 | ||
5 | const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button') | 4 | const Button: VideoJSComponentInterface = videojsUntyped.getComponent('Button') |
6 | class TheaterButton extends Button { | 5 | class TheaterButton extends Button { |