Improve video upload guard a little bit

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / video / video.model.ts

diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts
index 6929c8755786cf44d47881ce190032fe35e042d1..79351ba2a70458b8a84aee5a6cc9fe86ad76069d 100644 (file)
--- a/client/src/app/shared/video/video.model.ts
+++ b/client/src/app/shared/video/video.model.ts
@@ -1,8 +1,10 @@
-import { Video as VideoServerModel } from '../../../../../shared'
+import { Account } from '@app/shared/account/account.model'
 import { User } from '../'
+import { Video as VideoServerModel } from '../../../../../shared'
+import { getAbsoluteAPIUrl } from '../misc/utils'
 
 export class Video implements VideoServerModel {
-  account: string
+  accountName: string
   by: string
   createdAt: Date
   updatedAt: Date
@@ -20,7 +22,6 @@ export class Video implements VideoServerModel {
   isLocal: boolean
   name: string
   serverHost: string
-  tags: string[]
   thumbnailPath: string
   thumbnailUrl: string
   previewPath: string
@@ -31,10 +32,7 @@ export class Video implements VideoServerModel {
   likes: number
   dislikes: number
   nsfw: boolean
-
-  private static createByString (account: string, serverHost: string) {
-    return account + '@' + serverHost
-  }
+  account: Account
 
   private static createDurationString (duration: number) {
     const minutes = Math.floor(duration / 60)
@@ -46,13 +44,9 @@ export class Video implements VideoServerModel {
   }
 
   constructor (hash: VideoServerModel) {
-    let absoluteAPIUrl = API_URL
-    if (!absoluteAPIUrl) {
-      // The API is on the same domain
-      absoluteAPIUrl = window.location.origin
-    }
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
 
-    this.account = hash.account
+    this.accountName = hash.accountName
     this.createdAt = new Date(hash.createdAt.toString())
     this.categoryLabel = hash.categoryLabel
     this.category = hash.category
@@ -68,7 +62,6 @@ export class Video implements VideoServerModel {
     this.isLocal = hash.isLocal
     this.name = hash.name
     this.serverHost = hash.serverHost
-    this.tags = hash.tags
     this.thumbnailPath = hash.thumbnailPath
     this.thumbnailUrl = absoluteAPIUrl + hash.thumbnailPath
     this.previewPath = hash.previewPath
@@ -80,7 +73,7 @@ export class Video implements VideoServerModel {
     this.dislikes = hash.dislikes
     this.nsfw = hash.nsfw
 
-    this.by = Video.createByString(hash.account, hash.serverHost)
+    this.by = Account.CREATE_BY_STRING(hash.accountName, hash.serverHost)
   }
 
   isVideoNSFWForUser (user: User) {