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 d86ef8f9265127364901321f39e605551b3c02ca..79351ba2a70458b8a84aee5a6cc9fe86ad76069d 100644 (file)
--- a/client/src/app/shared/video/video.model.ts
+++ b/client/src/app/shared/video/video.model.ts
@@ -1,6 +1,7 @@
-import { Video as VideoServerModel } from '../../../../../shared'
+import { Account } from '@app/shared/account/account.model'
 import { User } from '../'
-import { Account } from '../../../../../shared/models/accounts'
+import { Video as VideoServerModel } from '../../../../../shared'
+import { getAbsoluteAPIUrl } from '../misc/utils'
 
 export class Video implements VideoServerModel {
   accountName: string
@@ -21,7 +22,6 @@ export class Video implements VideoServerModel {
   isLocal: boolean
   name: string
   serverHost: string
-  tags: string[]
   thumbnailPath: string
   thumbnailUrl: string
   previewPath: string
@@ -34,10 +34,6 @@ export class Video implements VideoServerModel {
   nsfw: boolean
   account: Account
 
-  private static createByString (account: string, serverHost: string) {
-    return account + '@' + serverHost
-  }
-
   private static createDurationString (duration: number) {
     const minutes = Math.floor(duration / 60)
     const seconds = duration % 60
@@ -48,11 +44,7 @@ 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.accountName = hash.accountName
     this.createdAt = new Date(hash.createdAt.toString())
@@ -70,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
@@ -82,7 +73,7 @@ export class Video implements VideoServerModel {
     this.dislikes = hash.dislikes
     this.nsfw = hash.nsfw
 
-    this.by = Video.createByString(hash.accountName, hash.serverHost)
+    this.by = Account.CREATE_BY_STRING(hash.accountName, hash.serverHost)
   }
 
   isVideoNSFWForUser (user: User) {