-
+
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'
export * from './account.service'
export * from './actor-avatar-info.component'
export * from './actor.model'
-export * from './avatar.component'
+export * 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
similarity index 100%
rename from client/src/app/shared/shared-main/account/avatar.component.html
rename to 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
similarity index 100%
rename from client/src/app/shared/shared-main/account/avatar.component.scss
rename to 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
similarity index 68%
rename from client/src/app/shared/shared-main/account/avatar.component.ts
rename to 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'
import { Video } from '../video/video.model'
@Component({
- selector: 'avatar-channel',
- templateUrl: './avatar.component.html',
- styleUrls: [ './avatar.component.scss' ]
+ selector: 'my-video-avatar-channel',
+ templateUrl: './video-avatar-channel.component.html',
+ styleUrls: [ './video-avatar-channel.component.scss' ]
})
-export class AvatarComponent implements OnInit {
+export class VideoAvatarChannelComponent implements OnInit {
@Input() video: Video
+ @Input() byAccount: string
+
@Input() size: 'md' | 'sm' = 'md'
@Input() genericChannel: boolean
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 {
NgbTooltipModule
} from '@ng-bootstrap/ng-bootstrap'
import { SharedGlobalIconModule } from '../shared-icons'
-import { AccountService, ActorAvatarInfoComponent, AvatarComponent } from './account'
+import { AccountService, ActorAvatarInfoComponent, VideoAvatarChannelComponent } from './account'
import {
BytesPipe,
DurationFormatterPipe,
@@ -57,7 +57,7 @@ import { VideoChannelService } from './video-channel'
],
declarations: [
- AvatarComponent,
+ VideoAvatarChannelComponent,
ActorAvatarInfoComponent,
FromNowPipe,
@@ -106,7 +106,7 @@ import { VideoChannelService } from './video-channel'
PrimeSharedModule,
- AvatarComponent,
+ VideoAvatarChannelComponent,
ActorAvatarInfoComponent,
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 @@
+import { AuthUser } from '@app/core'
+import { Account } from '@app/shared/shared-main/account/account.model'
+import { Actor } from '@app/shared/shared-main/account/actor.model'
+import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model'
import {
AbuseState,
ActorInfo,
FollowState,
UserNotification as UserNotificationServer,
UserNotificationType,
- VideoInfo,
- UserRight
+ UserRight,
+ VideoInfo
} from '@shared/models'
-import { Account, Actor, VideoChannel } from '@app/shared/shared-main'
-import { AuthUser } from '@app/core'
export class UserNotification implements UserNotificationServer {
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 @@
import { AuthUser } from '@app/core'
import { User } from '@app/core/users/user.model'
import { durationToString, getAbsoluteAPIUrl, getAbsoluteEmbedUrl } from '@app/helpers'
+import { Account } from '@app/shared/shared-main/account/account.model'
+import { Actor } from '@app/shared/shared-main/account/actor.model'
+import { VideoChannel } from '@app/shared/shared-main/video-channel/video-channel.model'
import { peertubeTranslate } from '@shared/core-utils/i18n'
import {
Avatar,
@@ -12,7 +15,6 @@ import {
VideoScheduleUpdate,
VideoState
} from '@shared/models'
-import { Account, Actor, VideoChannel } from '@app/shared/shared-main'
export class Video implements VideoServerModel {
byVideoChannel: string