import { Component, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Params, Router } from '@angular/router'
import { AuthService, ConfirmService, Notifier, RestPagination, RestTable, ServerService, UserService } from '@app/core'
-import { Actor, DropdownAction } from '@app/shared/shared-main'
+import { Account, DropdownAction } from '@app/shared/shared-main'
import { UserBanModalComponent } from '@app/shared/shared-moderation'
import { ServerConfig, User, UserRole } from '@shared/models'
}
switchToDefaultAvatar ($event: Event) {
- ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
+ ($event.target as HTMLImageElement).src = Account.GET_DEFAULT_AVATAR_URL()
}
async unbanUsers (users: User[]) {
import { SortMeta } from 'primeng/api'
import { Component, OnInit, ViewChild } from '@angular/core'
import { Notifier, RestPagination, RestTable } from '@app/core'
-import { Account, Actor, VideoOwnershipService } from '@app/shared/shared-main'
+import { Account, VideoOwnershipService } from '@app/shared/shared-main'
import { VideoChangeOwnership, VideoChangeOwnershipStatus } from '@shared/models'
import { MyAcceptOwnershipComponent } from './my-accept-ownership/my-accept-ownership.component'
}
switchToDefaultAvatar ($event: Event) {
- ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
+ ($event.target as HTMLImageElement).src = Account.GET_DEFAULT_AVATAR_URL()
}
openAcceptModal (videoChangeOwnership: VideoChangeOwnership) {
import { Notifier, User } from '@app/core'
import { VIDEO_COMMENT_TEXT_VALIDATOR } from '@app/shared/form-validators/video-comment-validators'
import { FormReactive, FormValidatorService } from '@app/shared/shared-forms'
-import { Video } from '@app/shared/shared-main'
+import { Video, Account } from '@app/shared/shared-main'
import { VideoComment, VideoCommentService } from '@app/shared/shared-video-comment'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { VideoCommentCreate } from '@shared/models'
getAvatarUrl () {
if (this.user) return this.user.accountAvatarUrl
- return window.location.origin + '/client/assets/images/default-avatar.png'
+ return Account.GET_DEFAULT_AVATAR_URL()
}
gotoLogin () {
import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild } from '@angular/core'
import { MarkdownService, Notifier, UserService } from '@app/core'
import { AuthService } from '@app/core/auth'
-import { Account, Actor, DropdownAction, Video } from '@app/shared/shared-main'
+import { Account, DropdownAction, Video } from '@app/shared/shared-main'
import { CommentReportComponent } from '@app/shared/shared-moderation/report-modals/comment-report.component'
import { VideoComment, VideoCommentThreadTree } from '@app/shared/shared-video-comment'
import { User, UserRight } from '@shared/models'
}
switchToDefaultAvatar ($event: Event) {
- ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
+ ($event.target as HTMLImageElement).src = Account.GET_DEFAULT_AVATAR_URL()
}
isNotDeletedOrDeletedWithReplies () {
import { Component, Input } from '@angular/core'
import { durationToString } from '@app/helpers'
-import { Actor } from '@app/shared/shared-main'
+import { Account } from '@app/shared/shared-main'
import { AbusePredefinedReasonsString } from '@shared/models'
import { ProcessedAbuse } from './processed-abuse.model'
}
switchToDefaultAvatar ($event: Event) {
- ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
+ ($event.target as HTMLImageElement).src = Account.GET_DEFAULT_AVATAR_URL()
}
}
}
switchToDefaultAvatar ($event: Event) {
- ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
+ ($event.target as HTMLImageElement).src = Account.GET_DEFAULT_AVATAR_URL()
}
async removeAbuse (abuse: AdminAbuse) {
import { Component, forwardRef, Input } from '@angular/core'
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
-import { Actor } from '@app/shared/shared-main/account/actor.model'
+import { VideoChannel } from '@app/shared/shared-main'
export type SelectChannelItem = {
id: number
get channels () {
return this.items.map(c => Object.assign(c, {
- avatarPath: c.avatarPath ? c.avatarPath : Actor.GET_DEFAULT_AVATAR_URL()
+ avatarPath: c.avatarPath ? c.avatarPath : VideoChannel.GET_DEFAULT_AVATAR_URL()
}))
}
-import { Account as ServerAccount } from '@shared/models/actors/account.model'
+import { Account as ServerAccount, Avatar } from '@shared/models'
import { Actor } from './actor.model'
export class Account extends Actor implements ServerAccount {
userId?: number
+ static GET_ACTOR_AVATAR_URL (actor: object) {
+ return Actor.GET_ACTOR_AVATAR_URL(actor) || this.GET_DEFAULT_AVATAR_URL()
+ }
+
+ static GET_DEFAULT_AVATAR_URL () {
+ return `${window.location.origin}/client/assets/images/default-avatar-account.png`
+ }
+
constructor (hash: ServerAccount) {
super(hash)
+ this.updateComputedAttributes()
+
this.displayName = hash.displayName
this.description = hash.description
this.userId = hash.userId
this.mutedServerByUser = false
this.mutedServerByInstance = false
}
+
+ updateAvatar (newAvatar: Avatar) {
+ this.avatar = newAvatar
+
+ this.updateComputedAttributes()
+ }
+
+ private updateComputedAttributes () {
+ this.avatarUrl = Account.GET_ACTOR_AVATAR_URL(this)
+ }
}
return absoluteAPIUrl + actor.avatar.path
}
-
- return this.GET_DEFAULT_AVATAR_URL()
- }
-
- static GET_DEFAULT_AVATAR_URL () {
- return window.location.origin + '/client/assets/images/default-avatar.png'
}
static CREATE_BY_STRING (accountName: string, host: string, forceHostname = false) {
this.avatar = hash.avatar
this.isLocal = Actor.IS_LOCAL(this.host)
-
- this.updateComputedAttributes()
- }
-
- updateAvatar (newAvatar: Avatar) {
- this.avatar = newAvatar
-
- this.updateComputedAttributes()
- }
-
- private updateComputedAttributes () {
- this.avatarUrl = Actor.GET_ACTOR_AVATAR_URL(this)
}
}
VideoInfo,
UserRight
} from '@shared/models'
-import { Actor } from '../account/actor.model'
+import { Account, Actor, VideoChannel } from '@app/shared/shared-main'
import { AuthUser } from '@app/core'
export class UserNotification implements UserNotificationServer {
// To prevent a notification popup crash in case of bug, wrap it inside a try/catch
try {
this.video = hash.video
- if (this.video) this.setAvatarUrl(this.video.channel)
+ if (this.video) this.setVideoChannelAvatarUrl(this.video.channel)
this.videoImport = hash.videoImport
this.comment = hash.comment
- if (this.comment) this.setAvatarUrl(this.comment.account)
+ if (this.comment) this.setAccountAvatarUrl(this.comment.account)
this.abuse = hash.abuse
this.videoBlacklist = hash.videoBlacklist
this.account = hash.account
- if (this.account) this.setAvatarUrl(this.account)
+ if (this.account) this.setAccountAvatarUrl(this.account)
this.actorFollow = hash.actorFollow
- if (this.actorFollow) this.setAvatarUrl(this.actorFollow.follower)
+ if (this.actorFollow) this.setAccountAvatarUrl(this.actorFollow.follower)
this.createdAt = hash.createdAt
this.updatedAt = hash.updatedAt
return [ this.buildVideoUrl(comment.video), { threadId: comment.threadId } ]
}
- private setAvatarUrl (actor: { avatarUrl?: string, avatar?: { url?: string, path: string } }) {
- actor.avatarUrl = Actor.GET_ACTOR_AVATAR_URL(actor)
+ private setAccountAvatarUrl (actor: { avatarUrl?: string, avatar?: { url?: string, path: string } }) {
+ actor.avatarUrl = Account.GET_ACTOR_AVATAR_URL(actor)
+ }
+
+ private setVideoChannelAvatarUrl (actor: { avatarUrl?: string, avatar?: { url?: string, path: string } }) {
+ actor.avatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(actor)
}
}
-import { VideoChannel as ServerVideoChannel, ViewsPerDate, Account } from '@shared/models'
+import { VideoChannel as ServerVideoChannel, ViewsPerDate, Account, Avatar } from '@shared/models'
import { Actor } from '../account/actor.model'
export class VideoChannel extends Actor implements ServerVideoChannel {
viewsPerDay?: ViewsPerDate[]
+ static GET_ACTOR_AVATAR_URL (actor: object) {
+ return Actor.GET_ACTOR_AVATAR_URL(actor) || this.GET_DEFAULT_AVATAR_URL()
+ }
+
+ static GET_DEFAULT_AVATAR_URL () {
+ return `${window.location.origin}/client/assets/images/default-avatar-videochannel.png`
+ }
+
constructor (hash: ServerVideoChannel) {
super(hash)
+ this.updateComputedAttributes()
+
this.displayName = hash.displayName
this.description = hash.description
this.support = hash.support
this.ownerAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.ownerAccount)
}
}
+
+ updateAvatar (newAvatar: Avatar) {
+ this.avatar = newAvatar
+
+ this.updateComputedAttributes()
+ }
+
+ private updateComputedAttributes () {
+ this.avatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(this)
+ }
}
VideoScheduleUpdate,
VideoState
} from '@shared/models'
-import { Actor } from '../account/actor.model'
+import { Account, Actor, VideoChannel } from '@app/shared/shared-main'
export class Video implements VideoServerModel {
byVideoChannel: string
this.byAccount = Actor.CREATE_BY_STRING(hash.account.name, hash.account.host)
this.byVideoChannel = Actor.CREATE_BY_STRING(hash.channel.name, hash.channel.host)
- this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account)
- this.videoChannelAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.channel)
+ this.accountAvatarUrl = Account.GET_ACTOR_AVATAR_URL(this.account)
+ this.videoChannelAvatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(this.channel)
this.category.label = peertubeTranslate(this.category.label, translations)
this.licence.label = peertubeTranslate(this.licence.label, translations)
import { SortMeta } from 'primeng/api'
import { Directive, OnInit } from '@angular/core'
import { Notifier, RestPagination, RestTable } from '@app/core'
-import { Actor } from '@app/shared/shared-main'
+import { Account } from '@app/shared/shared-main'
import { AccountBlock } from './account-block.model'
import { BlocklistComponentType, BlocklistService } from './blocklist.service'
}
switchToDefaultAvatar ($event: Event) {
- ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL()
+ ($event.target as HTMLImageElement).src = Account.GET_DEFAULT_AVATAR_URL()
}
unblockAccount (accountBlock: AccountBlock) {
import { getAbsoluteAPIUrl } from '@app/helpers'
-import { Actor } from '@app/shared/shared-main'
+import { Account, Actor } from '@app/shared/shared-main'
import { Account as AccountInterface, VideoComment as VideoCommentServerModel, VideoCommentAdmin as VideoCommentAdminServerModel } from '@shared/models'
export class VideoComment implements VideoCommentServerModel {
if (this.account) {
this.by = Actor.CREATE_BY_STRING(this.account.name, this.account.host)
- this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account)
+ this.accountAvatarUrl = Account.GET_ACTOR_AVATAR_URL(this.account)
const absoluteAPIUrl = getAbsoluteAPIUrl()
const thisHost = new URL(absoluteAPIUrl).host
if (this.account) {
this.by = Actor.CREATE_BY_STRING(this.account.name, this.account.host)
- this.accountAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.account)
+ this.accountAvatarUrl = Account.GET_ACTOR_AVATAR_URL(this.account)
this.account.localUrl = '/accounts/' + this.by
}
import { getAbsoluteAPIUrl, getAbsoluteEmbedUrl } from '@app/helpers'
-import { Actor } from '@app/shared/shared-main'
+import { Account, Actor, VideoChannel } from '@app/shared/shared-main'
import { peertubeTranslate } from '@shared/core-utils/i18n'
import {
AccountSummary,
this.ownerAccount = hash.ownerAccount
this.ownerBy = Actor.CREATE_BY_STRING(hash.ownerAccount.name, hash.ownerAccount.host)
- this.ownerAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.ownerAccount)
+ this.ownerAvatarUrl = Account.GET_ACTOR_AVATAR_URL(this.ownerAccount)
if (hash.videoChannel) {
this.videoChannel = hash.videoChannel
this.videoChannelBy = Actor.CREATE_BY_STRING(hash.videoChannel.name, hash.videoChannel.host)
- this.videoChannelAvatarUrl = Actor.GET_ACTOR_AVATAR_URL(this.videoChannel)
+ this.videoChannelAvatarUrl = VideoChannel.GET_ACTOR_AVATAR_URL(this.videoChannel)
}
this.privacy.label = peertubeTranslate(this.privacy.label, translations)