forks
/
peertube
1
0
Fork 0
Code Releases Activity

Refractor account by

This commit is contained in:
Chocobozzz 2018-01-08 10:35:54 +01:00
parent 93ef8a9d02
commit 76d36e0b35
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/app/shared/account/account.model.ts
View File

@ -22,4 +22,13 @@ export class Account implements ServerAccount {
return window.location.origin + '/client/assets/images/default-avatar.png' return window.location.origin + '/client/assets/images/default-avatar.png'
} }
static CREATE_BY_STRING (accountName: string, host: string) {
const absoluteAPIUrl = getAbsoluteAPIUrl()
const thisHost = new URL(absoluteAPIUrl).host
if (host.trim() === thisHost) return accountName
return accountName + '@' + host
}
} }

12
client/src/app/shared/video/video.model.ts
View File

@ -1,7 +1,6 @@
import { Account } from '@app/shared/account/account.model'
import { User } from '../' import { User } from '../'
import { Video as VideoServerModel } from '../../../../../shared' import { Video as VideoServerModel } from '../../../../../shared'
import { Account } from '../../../../../shared/models/actors'
import { environment } from '../../../environments/environment'
import { getAbsoluteAPIUrl } from '../misc/utils' import { getAbsoluteAPIUrl } from '../misc/utils'
export class Video implements VideoServerModel { export class Video implements VideoServerModel {
@ -35,13 +34,6 @@ export class Video implements VideoServerModel {
nsfw: boolean nsfw: boolean
account: Account account: Account
private static createByString (account: string, serverHost: string, apiURL: string) {
const thisHost = new URL(apiURL).host
if (serverHost.trim() === thisHost)
return account
return account + '@' + serverHost
}
private static createDurationString (duration: number) { private static createDurationString (duration: number) {
const minutes = Math.floor(duration / 60) const minutes = Math.floor(duration / 60)
const seconds = duration % 60 const seconds = duration % 60
@ -81,7 +73,7 @@ export class Video implements VideoServerModel {
this.dislikes = hash.dislikes this.dislikes = hash.dislikes
this.nsfw = hash.nsfw this.nsfw = hash.nsfw
this.by = Video.createByString(hash.accountName, hash.serverHost, absoluteAPIUrl) this.by = Account.CREATE_BY_STRING(hash.accountName, hash.serverHost)
} }
isVideoNSFWForUser (user: User) { isVideoNSFWForUser (user: User) {

11
client/src/app/videos/+video-watch/comment/video-comment.model.ts
View File

@ -1,4 +1,5 @@
import { Account } from '../../../../../../shared/models/actors' import { Account } from '@app/shared/account/account.model'
import { Account as AccountInterface } from '../../../../../../shared/models/actors'
import { VideoComment as VideoCommentServerModel } from '../../../../../../shared/models/videos/video-comment.model' import { VideoComment as VideoCommentServerModel } from '../../../../../../shared/models/videos/video-comment.model'
export class VideoComment implements VideoCommentServerModel { export class VideoComment implements VideoCommentServerModel {
@ -10,15 +11,11 @@ export class VideoComment implements VideoCommentServerModel {
videoId: number videoId: number
createdAt: Date | string createdAt: Date | string
updatedAt: Date | string updatedAt: Date | string
account: Account account: AccountInterface
totalReplies: number totalReplies: number
by: string by: string
private static createByString (account: string, serverHost: string) {
return account + '@' + serverHost
}
constructor (hash: VideoCommentServerModel) { constructor (hash: VideoCommentServerModel) {
this.id = hash.id this.id = hash.id
this.url = hash.url this.url = hash.url
@ -31,6 +28,6 @@ export class VideoComment implements VideoCommentServerModel {
this.account = hash.account this.account = hash.account
this.totalReplies = hash.totalReplies this.totalReplies = hash.totalReplies
this.by = VideoComment.createByString(this.account.name, this.account.host) this.by = Account.CREATE_BY_STRING(this.account.name, this.account.host)
} }
} }