X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fvideo%2Fvideo-details.model.ts;h=a1f7207a28149febeed5a569435dcf97da8a48a6;hb=e6f627975bebd00d396d11442e582d80856bc6bd;hp=d51bc01a787aefdb7beb07e4d2dec65ce6dcf667;hpb=d48ff09d27d234425c3e9f091ae9072d8e6d8b7a;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/video/video-details.model.ts b/client/src/app/shared/video/video-details.model.ts
index d51bc01a7..a1f7207a2 100644
--- a/client/src/app/shared/video/video-details.model.ts
+++ b/client/src/app/shared/video/video-details.model.ts
@@ -1,51 +1,25 @@
-import { Account } from '../../../../../shared/models/accounts'
-import { Video } from '../../shared/video/video.model'
-import { AuthUser } from '../../core'
 import {
+  UserRight,
+  VideoChannel,
   VideoDetails as VideoDetailsServerModel,
   VideoFile,
-  VideoChannel,
-  VideoResolution,
-  UserRight,
   VideoPrivacy
 } from '../../../../../shared'
+import { Account } from '../../../../../shared/models/actors'
+import { VideoConstant } from '../../../../../shared/models/videos/video.model'
+import { AuthUser } from '../../core'
+import { Video } from '../../shared/video/video.model'
 
 export class VideoDetails extends Video implements VideoDetailsServerModel {
-  accountName: string
-  by: string
-  createdAt: Date
-  updatedAt: Date
-  categoryLabel: string
-  category: number
-  licenceLabel: string
-  licence: number
-  languageLabel: string
-  language: number
-  description: string
-  duration: number
-  durationLabel: string
-  id: number
-  uuid: string
-  isLocal: boolean
-  name: string
-  serverHost: string
-  tags: string[]
-  thumbnailPath: string
-  thumbnailUrl: string
-  previewPath: string
-  previewUrl: string
-  embedPath: string
-  embedUrl: string
-  views: number
-  likes: number
-  dislikes: number
-  nsfw: boolean
+  privacy: VideoConstant<VideoPrivacy>
   descriptionPath: string
-  files: VideoFile[]
+  support: string
   channel: VideoChannel
-  privacy: VideoPrivacy
-  privacyLabel: string
+  tags: string[]
+  files: VideoFile[]
   account: Account
+  commentsEnabled: boolean
+
   likesPercent: number
   dislikesPercent: number
 
@@ -53,34 +27,19 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
     super(hash)
 
     this.privacy = hash.privacy
-    this.privacyLabel = hash.privacyLabel
     this.descriptionPath = hash.descriptionPath
     this.files = hash.files
     this.channel = hash.channel
     this.account = hash.account
     this.tags = hash.tags
+    this.support = hash.support
+    this.commentsEnabled = hash.commentsEnabled
 
-    this.likesPercent = (this.likes / (this.likes + this.dislikes)) * 100
-    this.dislikesPercent = (this.dislikes / (this.likes + this.dislikes)) * 100
-  }
-
-  getAppropriateMagnetUri (actualDownloadSpeed = 0) {
-    if (this.files === undefined || this.files.length === 0) return ''
-    if (this.files.length === 1) return this.files[0].magnetUri
-
-    // Find first video that is good for our download speed (remember they are sorted)
-    let betterResolutionFile = this.files.find(f => actualDownloadSpeed > (f.size / this.duration))
-
-    // If the download speed is too bad, return the lowest resolution we have
-    if (betterResolutionFile === undefined) {
-      betterResolutionFile = this.files.find(f => f.resolution === VideoResolution.H_240P)
-    }
-
-    return betterResolutionFile.magnetUri
+    this.buildLikeAndDislikePercents()
   }
 
   isRemovableBy (user: AuthUser) {
-    return user && this.isLocal === true && (this.accountName === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
+    return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
   }
 
   isBlackistableBy (user: AuthUser) {
@@ -88,6 +47,11 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
   }
 
   isUpdatableBy (user: AuthUser) {
-    return user && this.isLocal === true && user.username === this.accountName
+    return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.UPDATE_ANY_VIDEO))
+  }
+
+  buildLikeAndDislikePercents () {
+    this.likesPercent = (this.likes / (this.likes + this.dislikes)) * 100
+    this.dislikesPercent = (this.dislikes / (this.likes + this.dislikes)) * 100
   }
 }