aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-11-25 11:44:31 +0100
committerChocobozzz <me@florianbigard.com>2020-11-25 11:44:31 +0100
commit69524f6ed170c74fab8d5833920c389fde992f3e (patch)
tree70f21690f6de8e8bb11efb43249d2267d0844165
parentc418d483004dfbae9ea38d54aa1577db46d34a8a (diff)
downloadPeerTube-69524f6ed170c74fab8d5833920c389fde992f3e.tar.gz
PeerTube-69524f6ed170c74fab8d5833920c389fde992f3e.tar.zst
PeerTube-69524f6ed170c74fab8d5833920c389fde992f3e.zip
Fix circular dep issue
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.html2
-rw-r--r--client/src/app/shared/shared-main/account/index.ts2
-rw-r--r--client/src/app/shared/shared-main/account/video-avatar-channel.component.html (renamed from client/src/app/shared/shared-main/account/avatar.component.html)0
-rw-r--r--client/src/app/shared/shared-main/account/video-avatar-channel.component.scss (renamed from client/src/app/shared/shared-main/account/avatar.component.scss)0
-rw-r--r--client/src/app/shared/shared-main/account/video-avatar-channel.component.ts (renamed from client/src/app/shared/shared-main/account/avatar.component.ts)10
-rw-r--r--client/src/app/shared/shared-main/shared-main.module.ts6
-rw-r--r--client/src/app/shared/shared-main/users/user-notification.model.ts10
-rw-r--r--client/src/app/shared/shared-main/video/video.model.ts4
8 files changed, 20 insertions, 14 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index 9e469f0b0..a90908dbe 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -183,7 +183,7 @@
183 183
184 <div class="pt-3 border-top video-info-channel d-flex"> 184 <div class="pt-3 border-top video-info-channel d-flex">
185 <div class="video-info-channel-left d-flex"> 185 <div class="video-info-channel-left d-flex">
186 <avatar-channel [video]="video" [genericChannel]="isChannelDisplayNameGeneric()"></avatar-channel> 186 <my-video-avatar-channel [video]="video" [genericChannel]="isChannelDisplayNameGeneric()"></my-video-avatar-channel>
187 187
188 <div class="video-info-channel-left-links ml-1"> 188 <div class="video-info-channel-left-links ml-1">
189 <ng-container *ngIf="!isChannelDisplayNameGeneric()"> 189 <ng-container *ngIf="!isChannelDisplayNameGeneric()">
diff --git a/client/src/app/shared/shared-main/account/index.ts b/client/src/app/shared/shared-main/account/index.ts
index f5b9f3634..61c800e56 100644
--- a/client/src/app/shared/shared-main/account/index.ts
+++ b/client/src/app/shared/shared-main/account/index.ts
@@ -2,4 +2,4 @@ export * from './account.model'
2export * from './account.service' 2export * from './account.service'
3export * from './actor-avatar-info.component' 3export * from './actor-avatar-info.component'
4export * from './actor.model' 4export * from './actor.model'
5export * from './avatar.component' 5export * from './video-avatar-channel.component'
diff --git a/client/src/app/shared/shared-main/account/avatar.component.html b/client/src/app/shared/shared-main/account/video-avatar-channel.component.html
index 310cc926f..310cc926f 100644
--- a/client/src/app/shared/shared-main/account/avatar.component.html
+++ b/client/src/app/shared/shared-main/account/video-avatar-channel.component.html
diff --git a/client/src/app/shared/shared-main/account/avatar.component.scss b/client/src/app/shared/shared-main/account/video-avatar-channel.component.scss
index 37709fce6..37709fce6 100644
--- a/client/src/app/shared/shared-main/account/avatar.component.scss
+++ b/client/src/app/shared/shared-main/account/video-avatar-channel.component.scss
diff --git a/client/src/app/shared/shared-main/account/avatar.component.ts b/client/src/app/shared/shared-main/account/video-avatar-channel.component.ts
index 2967828a0..440e2b522 100644
--- a/client/src/app/shared/shared-main/account/avatar.component.ts
+++ b/client/src/app/shared/shared-main/account/video-avatar-channel.component.ts
@@ -2,12 +2,14 @@ import { Component, Input, OnInit } from '@angular/core'
2import { Video } from '../video/video.model' 2import { Video } from '../video/video.model'
3 3
4@Component({ 4@Component({
5 selector: 'avatar-channel', 5 selector: 'my-video-avatar-channel',
6 templateUrl: './avatar.component.html', 6 templateUrl: './video-avatar-channel.component.html',
7 styleUrls: [ './avatar.component.scss' ] 7 styleUrls: [ './video-avatar-channel.component.scss' ]
8}) 8})
9export class AvatarComponent implements OnInit { 9export class VideoAvatarChannelComponent implements OnInit {
10 @Input() video: Video 10 @Input() video: Video
11 @Input() byAccount: string
12
11 @Input() size: 'md' | 'sm' = 'md' 13 @Input() size: 'md' | 'sm' = 'md'
12 @Input() genericChannel: boolean 14 @Input() genericChannel: boolean
13 15
diff --git a/client/src/app/shared/shared-main/shared-main.module.ts b/client/src/app/shared/shared-main/shared-main.module.ts
index be0630395..74bb4559a 100644
--- a/client/src/app/shared/shared-main/shared-main.module.ts
+++ b/client/src/app/shared/shared-main/shared-main.module.ts
@@ -14,7 +14,7 @@ import {
14 NgbTooltipModule 14 NgbTooltipModule
15} from '@ng-bootstrap/ng-bootstrap' 15} from '@ng-bootstrap/ng-bootstrap'
16import { SharedGlobalIconModule } from '../shared-icons' 16import { SharedGlobalIconModule } from '../shared-icons'
17import { AccountService, ActorAvatarInfoComponent, AvatarComponent } from './account' 17import { AccountService, ActorAvatarInfoComponent, VideoAvatarChannelComponent } from './account'
18import { 18import {
19 BytesPipe, 19 BytesPipe,
20 DurationFormatterPipe, 20 DurationFormatterPipe,
@@ -57,7 +57,7 @@ import { VideoChannelService } from './video-channel'
57 ], 57 ],
58 58
59 declarations: [ 59 declarations: [
60 AvatarComponent, 60 VideoAvatarChannelComponent,
61 ActorAvatarInfoComponent, 61 ActorAvatarInfoComponent,
62 62
63 FromNowPipe, 63 FromNowPipe,
@@ -106,7 +106,7 @@ import { VideoChannelService } from './video-channel'
106 106
107 PrimeSharedModule, 107 PrimeSharedModule,
108 108
109 AvatarComponent, 109 VideoAvatarChannelComponent,
110 ActorAvatarInfoComponent, 110 ActorAvatarInfoComponent,
111 111
112 FromNowPipe, 112 FromNowPipe,
diff --git a/client/src/app/shared/shared-main/users/user-notification.model.ts b/client/src/app/shared/shared-main/users/user-notification.model.ts
index b1df4a584..1211995fd 100644
--- a/client/src/app/shared/shared-main/users/user-notification.model.ts
+++ b/client/src/app/shared/shared-main/users/user-notification.model.ts
@@ -1,14 +1,16 @@
1import { AuthUser } from '@app/core'
2import { Account } from '@app/shared/shared-main/account/account.model'
3import { Actor } from '@app/shared/shared-main/account/actor.model'
4import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model'
1import { 5import {
2 AbuseState, 6 AbuseState,
3 ActorInfo, 7 ActorInfo,
4 FollowState, 8 FollowState,
5 UserNotification as UserNotificationServer, 9 UserNotification as UserNotificationServer,
6 UserNotificationType, 10 UserNotificationType,
7 VideoInfo, 11 UserRight,
8 UserRight 12 VideoInfo
9} from '@shared/models' 13} from '@shared/models'
10import { Account, Actor, VideoChannel } from '@app/shared/shared-main'
11import { AuthUser } from '@app/core'
12 14
13export class UserNotification implements UserNotificationServer { 15export class UserNotification implements UserNotificationServer {
14 id: number 16 id: number
diff --git a/client/src/app/shared/shared-main/video/video.model.ts b/client/src/app/shared/shared-main/video/video.model.ts
index 8e0e68020..04e7bd717 100644
--- a/client/src/app/shared/shared-main/video/video.model.ts
+++ b/client/src/app/shared/shared-main/video/video.model.ts
@@ -1,6 +1,9 @@
1import { AuthUser } from '@app/core' 1import { AuthUser } from '@app/core'
2import { User } from '@app/core/users/user.model' 2import { User } from '@app/core/users/user.model'
3import { durationToString, getAbsoluteAPIUrl, getAbsoluteEmbedUrl } from '@app/helpers' 3import { durationToString, getAbsoluteAPIUrl, getAbsoluteEmbedUrl } from '@app/helpers'
4import { Account } from '@app/shared/shared-main/account/account.model'
5import { Actor } from '@app/shared/shared-main/account/actor.model'
6import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model'
4import { peertubeTranslate } from '@shared/core-utils/i18n' 7import { peertubeTranslate } from '@shared/core-utils/i18n'
5import { 8import {
6 Avatar, 9 Avatar,
@@ -12,7 +15,6 @@ import {
12 VideoScheduleUpdate, 15 VideoScheduleUpdate,
13 VideoState 16 VideoState
14} from '@shared/models' 17} from '@shared/models'
15import { Account, Actor, VideoChannel } from '@app/shared/shared-main'
16 18
17export class Video implements VideoServerModel { 19export class Video implements VideoServerModel {
18 byVideoChannel: string 20 byVideoChannel: string