} from '@angular/core'
import { AuthService, ScreenService, ServerService, User } from '@app/core'
import { ServerConfig, VideoPlaylistType, VideoPrivacy, VideoState } from '@shared/models'
+import { ActorAvatarSize } from '../shared-actor-image/actor-avatar.component'
import { Video } from '../shared-main'
import { VideoPlaylistService } from '../shared-video-playlist'
import { VideoActionsDisplayType } from './video-actions-dropdown.component'
-export type OwnerDisplayType = 'account' | 'videoChannel' | 'auto'
export type MiniatureDisplayOptions = {
date?: boolean
views?: boolean
@Input() user: User
@Input() video: Video
- @Input() ownerDisplayType: OwnerDisplayType = 'account'
@Input() displayOptions: MiniatureDisplayOptions = {
date: true,
views: true,
state: false,
blacklistInfo: false
}
- @Input() displayAsRow = false
@Input() displayVideoActions = true
- @Input() fitWidth = false
+
+ @Input() actorImageSize: ActorAvatarSize = '40'
+
+ @Input() displayAsRow = false
@Input() videoLinkType: VideoLinkType = 'internal'
videoHref: string
videoTarget: string
- private ownerDisplayTypeChosen: 'account' | 'videoChannel'
+ private ownerDisplayType: 'account' | 'videoChannel'
constructor (
private screenService: ScreenService,
buildVideoLink () {
if (this.videoLinkType === 'internal' || !this.video.url) {
- this.videoRouterLink = [ '/videos/watch', this.video.uuid ]
+ this.videoRouterLink = [ '/w', this.video.uuid ]
return
}
}
displayOwnerAccount () {
- return this.ownerDisplayTypeChosen === 'account'
+ return this.ownerDisplayType === 'account'
}
displayOwnerVideoChannel () {
- return this.ownerDisplayTypeChosen === 'videoChannel'
+ return this.ownerDisplayType === 'videoChannel'
}
isUnlistedVideo () {
return ''
}
- getAvatarUrl () {
- if (this.displayOwnerAccount()) {
- return this.video.accountAvatarUrl
- }
-
- return this.video.videoChannelAvatarUrl
- }
-
loadActions () {
if (this.displayVideoActions) this.showActions = true
return this.displayVideoActions && this.isUserLoggedIn() && this.inWatchLaterPlaylist !== undefined
}
- private setUpBy () {
- if (this.ownerDisplayType === 'account' || this.ownerDisplayType === 'videoChannel') {
- this.ownerDisplayTypeChosen = this.ownerDisplayType
- return
+ getClasses () {
+ return {
+ 'display-as-row': this.displayAsRow
}
+ }
+
+ private setUpBy () {
+ const accountName = this.video.account.name
// If the video channel name is an UUID (not really displayable, we changed this behaviour in v1.0.0-beta.12)
- // Or is just a suffix of the account (default created channel)
+ // Or has not been customized (default created channel display name)
// -> Use the account name
if (
- this.video.channel.name === `${this.video.account.name}_channel` ||
+ this.video.channel.displayName === `Default ${accountName} channel` ||
+ this.video.channel.displayName === `Main ${accountName} channel` ||
this.video.channel.name.match(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/)
) {
- this.ownerDisplayTypeChosen = 'account'
+ this.ownerDisplayType = 'account'
} else {
- this.ownerDisplayTypeChosen = 'videoChannel'
+ this.ownerDisplayType = 'videoChannel'
}
}